fix: parsed text placeholders should enter the text state on close qu…

…ote char
marko-js · Mar 15, 2023 · be73442 · be73442
1 parent 7a345a8
commit be73442
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.changeset/strong-deers-complain.md b/.changeset/strong-deers-complain.md
@@ -0,0 +1,5 @@
+---
+"htmljs-parser": patch
+---
+
+Fixes a regression where the parsed text state (used by eg `script`, `style`) was not properly entering back into text for the closing quote on the string.
diff --git a/src/__tests__/fixtures/script-with-strings/__snapshots__/script-with-strings.expected.txt b/src/__tests__/fixtures/script-with-strings/__snapshots__/script-with-strings.expected.txt
@@ -3,20 +3,20 @@
  │  │╰─ tagName "script"
  ╰─ ╰─ openTagStart
 2╭─   "this is a ${test}"
+ │  │            │ │    ╰─ text "\"\n  \"this is a "
  │  │            │ ╰─ placeholder:escape.value "test"
  │  │            ╰─ placeholder:escape "${test}"
  ╰─ ╰─ text "\n  \"this is a "
 3╭─   "this is a \${test}"
- │  │             ╰─ text "${test}\"\n  \"/*\"\n  \"//\"\n  'this is a "
- ╰─ ╰─ text "\n  \"this is a "
+ ╰─               ╰─ text "${test}\"\n  \"/*\"\n  \"//\"\n  'this is a "
 4├─   "/*"
 5├─   "//"
 6╭─   'this is a ${test}'
+ │               │ │    ╰─ text "'\n  'this is a "
  │               │ ╰─ placeholder:escape.value "test"
  ╰─              ╰─ placeholder:escape "${test}"
 7╭─   'this is a \${test}'
- │  │             ╰─ text "${test}'\n  '/*'\n  '//'\n  `this is a ${test}`\n  `this is a \\${test}`\n  `/*`\n  `//`\n"
- ╰─ ╰─ text "\n  'this is a "
+ ╰─               ╰─ text "${test}'\n  '/*'\n  '//'\n  `this is a ${test}`\n  `this is a \\${test}`\n  `/*`\n  `//`\n"
 8├─   '/*'
 9├─   '//'
 10├─   `this is a ${test}`

diff --git a/src/states/PARSED_STRING.ts b/src/states/PARSED_STRING.ts
@@ -21,6 +21,7 @@ export const PARSED_STRING: StateDefinition<ParsedStringMeta> = {
 
   char(code, str) {
     if (code === str.quoteCharCode) {
+      this.startText();
       this.pos++; // skip end quote
       this.exitState();
     } else if (!STATE.checkForPlaceholder(this, code)) {