Skip to content

Commit

Permalink
fix: onCloseTagStart event for text mode tags (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DylanPiercey
DylanPiercey authored Jun 27, 2022
1 parent 963c28d commit 8bd3c40
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 25 deletions.
5 changes: 5 additions & 0 deletions .changeset/late-cougars-attend.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"htmljs-parser": patch
---

Fix issue with onCloseTagStart not called for text mode tags (eg style, script, textarea & html-comment).
5 changes: 3 additions & 2 deletions src/__tests__/fixtures/cdata/__snapshots__/cdata.expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1╭─ <html-comment><![CDATA[[if lt IE 9]><div><![endif]]]></html-comment>
│ ││ ││ │ │ ╰─ closeTagEnd(html-comment)
│ ││ ││ │ ╰─ closeTagName "html-comment"
│ ││ ││ │ │ │ ╰─ closeTagEnd(html-comment)
│ ││ ││ │ │ ╰─ closeTagName "html-comment"
│ ││ ││ │ ╰─ closeTagStart "</"
│ ││ ││ ╰─ cdata.value "[if lt IE 9]><div><![endif]"
│ ││ │╰─ cdata "<![CDATA[[if lt IE 9]><div><![endif]]]>"
│ ││ ╰─ openTagEnd
Expand Down
10 changes: 6 additions & 4 deletions src/__tests__/fixtures/html-comment-tag/__snapshots__/html-comment-tag.expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
│ │ ╰─ comment "<!--123-->"
╰─ ╰─ text "\n "
3╭─ <html-comment>abc</html-comment>
│ │ ││ ││ │ ╰─ closeTagEnd(html-comment)
│ │ ││ ││ ╰─ closeTagName "html-comment"
│ │ ││ ││ │ │ ╰─ closeTagEnd(html-comment)
│ │ ││ ││ │ ╰─ closeTagName "html-comment"
│ │ ││ ││ ╰─ closeTagStart "</"
│ │ ││ │╰─ text "abc"
│ │ ││ ╰─ openTagEnd
│ │ │╰─ tagName "html-comment"
Expand All @@ -19,8 +20,9 @@
│ │ ╰─ comment "<!--[if lt IE 9]><script src=\"...\"></script><![endif]-->"
╰─ ╰─ text "\n "
5╭─ <html-comment>[if lt IE 9]><script src="..."></script><![endif]</html-comment>
│ │ ││ ││ │ ╰─ closeTagEnd(html-comment)
│ │ ││ ││ ╰─ closeTagName "html-comment"
│ │ ││ ││ │ │ ╰─ closeTagEnd(html-comment)
│ │ ││ ││ │ ╰─ closeTagName "html-comment"
│ │ ││ ││ ╰─ closeTagStart "</"
│ │ ││ │╰─ text "[if lt IE 9]><script src=\"...\"></script><![endif]"
│ │ ││ ╰─ openTagEnd
│ │ │╰─ tagName "html-comment"
Expand Down
5 changes: 3 additions & 2 deletions ...eral-string/__snapshots__/parsed-text-placeholder-in-template-literal-string.expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
5├─ ${bar}
6├─ */
7╭─ </script>
│ │ ╰─ closeTagEnd(script)
╰─ ╰─ closeTagName "script"
│ │ │ ╰─ closeTagEnd(script)
│ │ ╰─ closeTagName "script"
╰─ ╰─ closeTagStart "</"
8╰─
5 changes: 3 additions & 2 deletions ...__tests__/fixtures/parsed-text-style-tag/__snapshots__/parsed-text-style-tag.expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1╭─ <style>/* block comment within <style> */"string within \"<style>\""'string within \'<style>\''</style>
│ ││ ││ │ ╰─ closeTagEnd(style)
│ ││ ││ ╰─ closeTagName "style"
│ ││ ││ │ │ ╰─ closeTagEnd(style)
│ ││ ││ │ ╰─ closeTagName "style"
│ ││ ││ ╰─ closeTagStart "</"
│ ││ │╰─ text "/* block comment within <style> */\"string within \\\"<style>\\\"\"'string within \\'<style>\\''"
│ ││ ╰─ openTagEnd
│ │╰─ tagName "style"
Expand Down
5 changes: 3 additions & 2 deletions ...y-multi-line-js-comment/__snapshots__/placeholder-body-multi-line-js-comment.expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1╭─ <script>/* Copyright $!{date} */</script>
│ ││ ││ │ ╰─ closeTagEnd(script)
│ ││ ││ ╰─ closeTagName "script"
│ ││ ││ │ │ ╰─ closeTagEnd(script)
│ ││ ││ │ ╰─ closeTagName "script"
│ ││ ││ ╰─ closeTagStart "</"
│ ││ │╰─ text "/* Copyright $!{date} */"
│ ││ ╰─ openTagEnd
│ │╰─ tagName "script"
Expand Down
5 changes: 3 additions & 2 deletions ...single-line-js-comment/__snapshots__/placeholder-body-single-line-js-comment.expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
│ │╰─ tagName "script"
╰─ ╰─ openTagStart
2╭─ </script>
│ │ ╰─ closeTagEnd(script)
╰─ ╰─ closeTagName "script"
│ │ │ ╰─ closeTagEnd(script)
│ │ ╰─ closeTagName "script"
╰─ ╰─ closeTagStart "</"
5 changes: 3 additions & 2 deletions ...es/placeholder-within-script-tag/__snapshots__/placeholder-within-script-tag.expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1╭─ <script>Hello ${xyz}!</script>
│ ││ ││ │ │ │ │ ╰─ closeTagEnd(script)
│ ││ ││ │ │ │ ╰─ closeTagName "script"
│ ││ ││ │ │ ││ │ ╰─ closeTagEnd(script)
│ ││ ││ │ │ ││ ╰─ closeTagName "script"
│ ││ ││ │ │ │╰─ closeTagStart "</"
│ ││ ││ │ │ ╰─ text
│ ││ ││ │ ╰─ placeholder:escape.value "xyz"
│ ││ ││ ╰─ placeholder:escape "${xyz}"
Expand Down
5 changes: 3 additions & 2 deletions ...n-script-within-string/__snapshots__/placeholder-within-script-within-string.expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1╭─ <script>alert("Hello ${xyz}!")</script>
│ ││ ││ │ │ │ │ ╰─ closeTagEnd(script)
│ ││ ││ │ │ │ ╰─ closeTagName "script"
│ ││ ││ │ │ │ │ │ ╰─ closeTagEnd(script)
│ ││ ││ │ │ │ │ ╰─ closeTagName "script"
│ ││ ││ │ │ │ ╰─ closeTagStart "</"
│ ││ ││ │ │ ╰─ text "!\")"
│ ││ ││ │ ╰─ placeholder:escape.value "xyz"
│ ││ ││ ╰─ placeholder:escape "${xyz}"
Expand Down
3 changes: 2 additions & 1 deletion ...fixtures/script-escaped-placeholder/__snapshots__/script-escaped-placeholder.expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
4╭─ </script>
│ │ │ ╰─ closeTagEnd(script)
│ │ ╰─ closeTagName "script"
╰─ ╰─ text "\n"
│ ├─ text "\n"
╰─ ╰─ closeTagStart "</"
5 changes: 3 additions & 2 deletions ...fixtures/script-single-line-comment/__snapshots__/script-single-line-comment.expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1╭─ <script>// this is a comment</script>
│ ││ ││ │ ╰─ closeTagEnd(script)
│ ││ ││ ╰─ closeTagName "script"
│ ││ ││ │ │ ╰─ closeTagEnd(script)
│ ││ ││ │ ╰─ closeTagName "script"
│ ││ ││ ╰─ closeTagStart "</"
│ ││ │╰─ text "// this is a comment"
│ ││ ╰─ openTagEnd
│ │╰─ tagName "script"
Expand Down
5 changes: 3 additions & 2 deletions src/__tests__/fixtures/script-tag-entities/__snapshots__/script-tag-entities.expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1╭─ <script>console.log('<div>Hello ${input.name}</div>');</script>
│ ││ ││ │ │ │ │ ╰─ closeTagEnd(script)
│ ││ ││ │ │ │ ╰─ closeTagName "script"
│ ││ ││ │ │ │ │ │ ╰─ closeTagEnd(script)
│ ││ ││ │ │ │ │ ╰─ closeTagName "script"
│ ││ ││ │ │ │ ╰─ closeTagStart "</"
│ ││ ││ │ │ ╰─ text "</div>');"
│ ││ ││ │ ╰─ placeholder:escape.value "input.name"
│ ││ ││ ╰─ placeholder:escape "${input.name}"
Expand Down
5 changes: 3 additions & 2 deletions src/__tests__/fixtures/script/__snapshots__/script.expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
│ │╰─ tagName "script"
╰─ ╰─ openTagStart
2╭─ /* block comment within <script> */"string within \"<script>\""'string within \'<script>\''</script>
│ │ ╰─ closeTagEnd(script)
╰─ ╰─ closeTagName "script"
│ │ │ ╰─ closeTagEnd(script)
│ │ ╰─ closeTagName "script"
╰─ ╰─ closeTagStart "</"
4 changes: 4 additions & 0 deletions src/states/CLOSE_TAG.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ export function checkForClosingTag(parser: Parser) {

if (match) {
parser.endText();
parser.options.onCloseTagStart?.({
start: curPos - 1,
end: curPos + 1,
});

if (
ensureExpectedCloseTag(parser, {
Expand Down

0 comments on commit 8bd3c40

Please sign in to comment.