script: Update name validation for attribute, element, and doctype #37747

minghuaw · 2025-06-27T11:07:55Z

A recent update in the spec (whatwg/dom#1079) introduced new rules for name validation of attribute, element, and doctype. This PR implements the new name validation rules in components/script/dom/bindings/domname.rs. The old XML name validation rules are not fully removed because there remains a few usage of it in ProcessingInstructions and xpath.

Testing: Covered by WPT tests
Fixes: #37746

yezhizhen · 2025-06-28T06:15:17Z

You need to git commit -s to sign off, for each commits to pass DCO.

servo-wpt-sync · 2025-06-29T15:17:26Z

🛠 These changes could not be applied onto the latest upstream WPT. Servo's copy of the Web Platform Tests may be out of sync.

minghuaw · 2025-06-30T04:06:11Z

Below is a summary of how the current draft performs on a few related WPT test files (the live version)

WPT Test File	Status (Passed/Total)
`wpt/dom/nodes/Document-createAttribute.html`	36/36
`wpt/dom/nodes/Document-createElement.html`	147/147
`wpt/dom/nodes/Document-createElementNS.html`	575/596
`wpt/dom/nodes/name-validation.html`	5/5
`wpt/dom/nodes/DOMImplementation-createDocumentType.html`	82/82

The test cases that are still failing in wpt/dom/nodes/Document-createElementNS.html seem to be caused by confusion and/or bug in the testing implementation (see web-platform-tests/wpt#53464).

Would this draft be considered good enough for review or is it better to wait until it passes all wpt/dom/nodes/Document-createElementNS.html test cases?

xiaochengh · 2025-07-02T06:35:36Z

components/script/dom/document.rs

@@ -120,9 +123,7 @@ use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::bindings::trace::{HashMapTracedValues, NoTrace};
 #[cfg(feature = "webgpu")]
 use crate::dom::bindings::weakref::WeakRef;
-use crate::dom::bindings::xmlname::{
-    matches_name_production, namespace_from_domstring, validate_and_extract,


Are these methods still being used?

If not, let's remove them. Otherwise we need to somehow unify them with the new methods introduced by this PR.

The main consideration is to avoid maintaining multiple mechanisms for the same thing.

matches_name_production is still being used in two places that still requires XML naming rules (CreateProcessingInstruction and set_custom_attribute, which do require XML naming after the spec update see whatwg/dom#1079 and https://html.spec.whatwg.org/multipage/dom.html#custom-data-attribute).

namespace_from_domstring is just a convenient conversion that's used in many places, but we could also move it into the name_validation mod.

There remains one usage of xmlname::validate_and_extract during evaluation of xpath, which I assume that XML naming rules is used. The relevant docs are not well maintained (see https://dom.spec.whatwg.org/#xpath)

It appears that after this change, usage of xmlname will be the special case. We need to decide the fate of the exposed functions there:

matches_name_production is well-scoped by XML and should remain there

namespace_from_domstring seems still widely used and should be moved to the new file

validate_and_extract and validate_and_extract_qualified_name no longer implement the spec, and in the best case should be removed. Could you list out links to all the the renaming usages and let's decide?

3. `validate_and_extract` and `validate_and_extract_qualified_name` no longer implement the spec, and in the best case should be removed. Could you list out links to all the the renaming usages and let's decide?

This is the only remaining usage of the xmlname::validate_and_extract script::xpath::eval

servo/components/script/xpath/eval.rs

Line 270 in e609017

if let Ok((ns, prefix, local)) = validate_and_extract(namespace, &qname_as_str) {

We could probably move validate_and_extract and validate_and_extract_qualified_name into this file?

Moved validate_and_extract and validate_and_extract_qualified_name from script/dom/bindings/xmlname.rs to script/xpath/eval.rs and restricted their visibility to private. See commit 73f22a5

components/script/dom/bindings/name_validation.rs

xiaochengh · 2025-07-02T08:34:55Z

components/script/dom/document.rs

@@ -120,9 +123,7 @@ use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::bindings::trace::{HashMapTracedValues, NoTrace};
 #[cfg(feature = "webgpu")]
 use crate::dom::bindings::weakref::WeakRef;
-use crate::dom::bindings::xmlname::{
-    matches_name_production, namespace_from_domstring, validate_and_extract,


It appears that after this change, usage of xmlname will be the special case. We need to decide the fate of the exposed functions there:

matches_name_production is well-scoped by XML and should remain there

namespace_from_domstring seems still widely used and should be moved to the new file

validate_and_extract and validate_and_extract_qualified_name no longer implement the spec, and in the best case should be removed. Could you list out links to all the the renaming usages and let's decide?

components/script/dom/bindings/name_validation.rs

xiaochengh

LGTM, thanks!

yezhizhen · 2025-07-04T09:16:50Z

Remember to update PR message as well, which would be the commit message in main.

xiaochengh · 2025-07-04T09:54:28Z

Please let me know when this is ready for merging, thanks

minghuaw · 2025-07-04T10:28:15Z

Remember to update PR message as well, which would be the commit message in main.

@yezhizhen Do you mind taking a look at the updated PR message? Just trying to see if it's explanatory enough for someone who didn't review the changes? Thanks

yezhizhen · 2025-07-04T10:37:23Z

@minghuaw It is very concise and understandable to me.

minghuaw · 2025-07-10T08:20:47Z

Here's the updated WPT test result: https://github.com/minghuaw/servo/actions/runs/16188707259/job/45702433544.

@xiaochengh This is ready to get merged

servo-wpt-sync · 2025-07-11T01:08:27Z

🛠 These changes could not be applied onto the latest upstream WPT. Servo's copy of the Web Platform Tests may be out of sync.

Signed-off-by: minghuaw <[email protected]>

Signed-off-by: Minghua Wu <[email protected]>

Co-authored-by: Xiaocheng Hu <[email protected]> Signed-off-by: minghuaw <[email protected]>

Signed-off-by: Minghua Wu <[email protected]>

Signed-off-by: minghuaw <[email protected]>

Signed-off-by: Minghua Wu <[email protected]>

Signed-off-by: minghuaw <[email protected]>

minghuaw requested a review from gterzian as a code owner June 27, 2025 11:07

minghuaw mentioned this pull request Jun 27, 2025

Update validation of element, attribute, and doctype names #37746

Closed

minghuaw marked this pull request as draft June 27, 2025 11:09

minghuaw closed this Jun 30, 2025

minghuaw force-pushed the fix/wpt/dom/nodes/Document-createAttribute branch from 0b3d4c8 to cbb0407 Compare June 30, 2025 01:30

minghuaw reopened this Jun 30, 2025

minghuaw marked this pull request as ready for review June 30, 2025 06:48

minghuaw force-pushed the fix/wpt/dom/nodes/Document-createAttribute branch from d52c0fe to e6fa526 Compare June 30, 2025 08:06

minghuaw changed the title ~~fix: Update name validation for attribute, element, and doctype~~ script: Update name validation for attribute, element, and doctype Jun 30, 2025

yezhizhen requested review from xiaochengh and simonwuelker June 30, 2025 09:35

minghuaw force-pushed the fix/wpt/dom/nodes/Document-createAttribute branch from e6fa526 to 34c2623 Compare July 2, 2025 00:56

xiaochengh reviewed Jul 2, 2025

View reviewed changes

minghuaw force-pushed the fix/wpt/dom/nodes/Document-createAttribute branch from 34c2623 to e609017 Compare July 2, 2025 07:40

xiaochengh reviewed Jul 2, 2025

View reviewed changes

minghuaw force-pushed the fix/wpt/dom/nodes/Document-createAttribute branch 4 times, most recently from 710e2e7 to 935e866 Compare July 3, 2025 09:52

xiaochengh approved these changes Jul 4, 2025

View reviewed changes

xiaochengh enabled auto-merge July 4, 2025 08:08

auto-merge was automatically disabled July 4, 2025 08:53
Head branch was pushed to by a user without write access

minghuaw force-pushed the fix/wpt/dom/nodes/Document-createAttribute branch from 935e866 to 558bd15 Compare July 4, 2025 08:53

jdm added this pull request to the merge queue Jul 11, 2025

minghuaw and others added 24 commits July 11, 2025 10:50

implement new name validation

e04ab07

Signed-off-by: minghuaw <[email protected]>

fix usage of name_validation

1aeac53

Signed-off-by: minghuaw <[email protected]>

fmt

4892a77

Signed-off-by: minghuaw <[email protected]>

fix bug in is_valid_element_local_name impl

bdd1e6b

Signed-off-by: minghuaw <[email protected]>

update rules for validate_and_extract

daf2e31

Signed-off-by: minghuaw <[email protected]>

fix strict split

90af696

Signed-off-by: minghuaw <[email protected]>

found inconsistencies in WPT and spec

29c7e79

Signed-off-by: minghuaw <[email protected]>

pass wpt live name_validation test

5e8e6af

Signed-off-by: Minghua Wu <[email protected]>

change from contains to find the index of :

929b41f

Signed-off-by: Minghua Wu <[email protected]>

fmt and test-tidy

f426b58

Signed-off-by: Minghua Wu <[email protected]>

update .ini config for subtests

67375cb

Signed-off-by: Minghua Wu <[email protected]>

Update components/script/dom/bindings/name_validation.rs

59dc474

Co-authored-by: Xiaocheng Hu <[email protected]> Signed-off-by: minghuaw <[email protected]>

Update components/script/dom/bindings/name_validation.rs

7eb2bf0

Co-authored-by: Xiaocheng Hu <[email protected]> Signed-off-by: minghuaw <[email protected]>

Update components/script/dom/bindings/name_validation.rs

302e8c2

Co-authored-by: Xiaocheng Hu <[email protected]> Signed-off-by: minghuaw <[email protected]>

use char::is_ascii_whitespace

c698ddb

Signed-off-by: Minghua Wu <[email protected]>

remove unnecessary See

38e5ad7

Signed-off-by: Minghua Wu <[email protected]>

renamed name_validation to domname

bc1b5e6

Signed-off-by: Minghua Wu <[email protected]>

move namespace_from_domstring to script::dom::bindings::domname

68ab26e

Signed-off-by: Minghua Wu <[email protected]>

move xmlname::validate_and_extract to xpath::eval

838d79d

Signed-off-by: Minghua Wu <[email protected]>

fix clippy warnings

d567df8

Signed-off-by: minghuaw <[email protected]>

update wpt ini

eccd2cf

Signed-off-by: minghuaw <[email protected]>

update prefix handling in validate_and_extract

7342b62

Signed-off-by: Minghua Wu <[email protected]>

rm .ini file for passed subtest

8ecc908

Signed-off-by: minghuaw <[email protected]>

rm passed subtest .ini file

ebef119

Signed-off-by: minghuaw <[email protected]>

minghuaw force-pushed the fix/wpt/dom/nodes/Document-createAttribute branch from d6d9d53 to ebef119 Compare July 11, 2025 02:51

Merged via the queue into servo:main with commit 5b507dc Jul 11, 2025
2 checks passed

Uh oh!

script: Update name validation for attribute, element, and doctype #37747

script: Update name validation for attribute, element, and doctype #37747

Uh oh!

Conversation

minghuaw commented Jun 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yezhizhen commented Jun 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

servo-wpt-sync commented Jun 29, 2025

Uh oh!

minghuaw commented Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xiaochengh Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

minghuaw Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xiaochengh Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

minghuaw Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

minghuaw Jul 3, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

xiaochengh Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

xiaochengh left a comment

Choose a reason for hiding this comment

Uh oh!

yezhizhen commented Jul 4, 2025

Uh oh!

xiaochengh commented Jul 4, 2025

Uh oh!

minghuaw commented Jul 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yezhizhen commented Jul 4, 2025

Uh oh!

minghuaw commented Jul 10, 2025

Uh oh!

servo-wpt-sync commented Jul 11, 2025

Uh oh!

Uh oh!

Uh oh!

minghuaw commented Jun 27, 2025 •

edited

Loading

yezhizhen commented Jun 28, 2025 •

edited

Loading

minghuaw commented Jun 30, 2025 •

edited

Loading

minghuaw Jul 2, 2025 •

edited

Loading

minghuaw commented Jul 4, 2025 •

edited

Loading