Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: exclude custom elements from HTML tree validation #13540

Merged
merged 1 commit into from
Oct 9, 2024
Merged

fix: exclude custom elements from HTML tree validation #13540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/chilly-glasses-retire.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: exclude custom elements from HTML tree validation
7 changes: 7 additions & 0 deletions packages/svelte/src/html-tree-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,17 @@ const disallowed_children = {
* @returns {boolean}
*/
export function is_tag_valid_with_ancestor(tag, ancestors) {
if (tag.includes('-')) return true; // custom elements can be anything

const target = ancestors[ancestors.length - 1];
const disallowed = disallowed_children[target];
if (!disallowed) return true;

if ('reset_by' in disallowed && disallowed.reset_by) {
for (let i = ancestors.length - 2; i >= 0; i--) {
const ancestor = ancestors[i];
if (ancestor.includes('-')) return true; // custom elements can be anything

// A reset means that forbidden descendants are allowed again
if (disallowed.reset_by.includes(ancestors[i])) {
return true;
Expand All @@ -166,6 +171,8 @@ export function is_tag_valid_with_ancestor(tag, ancestors) {
* @returns {boolean}
*/
export function is_tag_valid_with_parent(tag, parent_tag) {
if (tag.includes('-') || parent_tag?.includes('-')) return true; // custom elements can be anything

if (parent_tag !== null) {
const disallowed = disallowed_children[parent_tag];

Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/tests/validator/samples/invalid-node-placement-6/errors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"code": "node_invalid_placement",
"message": "`<dt>` is invalid inside `<dd>`",
"start": {
"line": 11,
"line": 16,
"column": 3
},
"end": {
"line": 11,
"line": 16,
"column": 19
}
}
Expand Down
5 changes: 5 additions & 0 deletions packages/svelte/tests/validator/samples/invalid-node-placement-6/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
<dt>valid</dt>
<dd>valid</dd>
</dl>
<!-- custom element resets the validation -->
<foo-bar>
<dt>valid</dt>
<dd>valid</dd>
</foo-bar>
<!-- other tags don't -->
<div>
<dt>invalid</dt>
Expand Down
14 changes: 14 additions & 0 deletions packages/svelte/tests/validator/samples/invalid-node-placement-7/errors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"code": "node_invalid_placement",
"message": "`<tbody>` is invalid inside `<div>`",
"start": {
"line": 8,
"column": 1
},
"end": {
"line": 8,
"column": 16
}
}
]
9 changes: 9 additions & 0 deletions packages/svelte/tests/validator/samples/invalid-node-placement-7/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<some-table>
<!-- No error -->
<tbody></tbody>
</some-table>

<div>
<!-- Error -->
<tbody></tbody>
</div>