chore: add missing placeholder locations from test snapshots

DylanPiercey · DylanPiercey · commit 5fe42f7305fe · 2022-04-04T20:52:24.000-07:00
diff --git a/src/__tests__/fixtures/complex/__snapshots__/complex.expected.txt b/src/__tests__/fixtures/complex/__snapshots__/complex.expected.txt
@@ -45,11 +45,13 @@
   │  ├─ closeTag(b)
   ╰─ ╰─ tagName "app-hello"
 22╭─     -- ${data.name} some html - <b>bold</b>
-  │  │                  │             │││   │ │ ╰─ closeTag(app-hello)
-  │  │                  │             │││   │ ╰─ closeTag(b).value
-  │  │                  │             │││   ╰─ closeTag(b) "</b>"
-  │  │                  │             ││╰─ text "bold"
-  │  │                  │             │╰─ openTagEnd
-  │  │                  │             ╰─ tagName
-  │  │                  ╰─ text " some html - "
+  │  │      │ │         │             │││   │ │ ╰─ closeTag(app-hello)
+  │  │      │ │         │             │││   │ ╰─ closeTag(b).value
+  │  │      │ │         │             │││   ╰─ closeTag(b) "</b>"
+  │  │      │ │         │             ││╰─ text "bold"
+  │  │      │ │         │             │╰─ openTagEnd
+  │  │      │ │         │             ╰─ tagName
+  │  │      │ │         ╰─ text " some html - "
+  │  │      │ ╰─ placeholder:escape.value "data.name"
+  │  │      ╰─ placeholder:escape "${data.name}"
   ╰─ ╰─ openTagEnd
diff --git a/src/__tests__/fixtures/concise-contentplaceholder-html-start/__snapshots__/concise-contentplaceholder-html-start.expected.txt b/src/__tests__/fixtures/concise-contentplaceholder-html-start/__snapshots__/concise-contentplaceholder-html-start.expected.txt
@@ -1,7 +1,9 @@
 1╭─ -- ${data.name} some html - <b>bold</b>
- │                 │             │││   │ ╰─ closeTag(b).value
- │                 │             │││   ╰─ closeTag(b) "</b>"
- │                 │             ││╰─ text "bold"
- │                 │             │╰─ openTagEnd
- │                 │             ╰─ tagName
- ╰─                ╰─ text " some html - "
+ │     │ │         │             │││   │ ╰─ closeTag(b).value
+ │     │ │         │             │││   ╰─ closeTag(b) "</b>"
+ │     │ │         │             ││╰─ text "bold"
+ │     │ │         │             │╰─ openTagEnd
+ │     │ │         │             ╰─ tagName
+ │     │ │         ╰─ text " some html - "
+ │     │ ╰─ placeholder:escape.value "data.name"
+ ╰─    ╰─ placeholder:escape "${data.name}"
diff --git a/src/__tests__/fixtures/concise-contentplaceholder-start/__snapshots__/concise-contentplaceholder-start.expected.txt b/src/__tests__/fixtures/concise-contentplaceholder-start/__snapshots__/concise-contentplaceholder-start.expected.txt
@@ -1 +1,3 @@
-1╰─ -- ${data.name}
+1╭─ -- ${data.name}
+ │     │ ╰─ placeholder:escape.value "data.name"
+ ╰─    ╰─ placeholder:escape "${data.name}"
diff --git a/src/__tests__/fixtures/empty-closing-tag2/__snapshots__/empty-closing-tag2.expected.txt b/src/__tests__/fixtures/empty-closing-tag2/__snapshots__/empty-closing-tag2.expected.txt
@@ -11,6 +11,8 @@
  │  │    ╰─ tagName "li"
  ╰─ ╰─ text "\n    "
 3╭─         ${feature}
+ │  │       │ ╰─ placeholder:escape.value "feature"
+ │  │       ╰─ placeholder:escape "${feature}"
  ╰─ ╰─ text "\n        "
 4╭─     </li>
  │  │   │ ╰─ closeTag(li).value "li"
diff --git a/src/__tests__/fixtures/mixed-invalid/__snapshots__/mixed-invalid.expected.txt b/src/__tests__/fixtures/mixed-invalid/__snapshots__/mixed-invalid.expected.txt
@@ -16,7 +16,9 @@
  │  │    ╰─ tagName "span"
  ╰─ ╰─ text "\n    "
 4╭─         Hello ${data.name}!
- │  │                         ╰─ text "!\n        "
+ │  │             │ │         ╰─ text "!\n        "
+ │  │             │ ╰─ placeholder:escape.value "data.name"
+ │  │             ╰─ placeholder:escape "${data.name}"
  ╰─ ╰─ text "\n        Hello "
 5╭─         </span>
  │          │ ╰─ closeTag(span).value "span"
diff --git a/src/__tests__/fixtures/mixed/__snapshots__/mixed.expected.txt b/src/__tests__/fixtures/mixed/__snapshots__/mixed.expected.txt
@@ -16,7 +16,9 @@
  │  │    ╰─ tagName "span"
  ╰─ ╰─ text "\n    "
 4╭─         Hello ${data.name}!
- │  │                         ╰─ text "!\n        "
+ │  │             │ │         ╰─ text "!\n        "
+ │  │             │ ╰─ placeholder:escape.value "data.name"
+ │  │             ╰─ placeholder:escape "${data.name}"
  ╰─ ╰─ text "\n        Hello "
 5╭─         </span>
  │          │ ╰─ closeTag(span).value "span"
diff --git a/src/__tests__/fixtures/placeholder-backslash/__snapshots__/placeholder-backslash.expected.txt b/src/__tests__/fixtures/placeholder-backslash/__snapshots__/placeholder-backslash.expected.txt
@@ -31,6 +31,8 @@
  │   │╰─ openTagEnd
  ╰─  ╰─ tagName
 8╭─     \\${test}
+ │  │     │ ╰─ placeholder:escape.value "test"
+ │  │     ╰─ placeholder:escape "${test}"
  ╰─ ╰─ text "\n    \\"
 9╭─ </b>
  │  │ ╰─ closeTag(b).value
@@ -49,6 +51,8 @@
   │   │╰─ openTagEnd
   ╰─  ╰─ tagName
 14╭─     \\$!{test}
+  │  │     │  ╰─ placeholder.value "test"
+  │  │     ╰─ placeholder "$!{test}"
   ╰─ ╰─ text "\n    \\"
 15╭─ </d>
   │  │ ╰─ closeTag(d).value
diff --git a/src/__tests__/fixtures/placeholder-body-text/__snapshots__/placeholder-body-text.expected.txt b/src/__tests__/fixtures/placeholder-body-text/__snapshots__/placeholder-body-text.expected.txt
@@ -1,7 +1,9 @@
 1╭─ <div>Hello ${xyz}!</div>
- │   │  ││           ││ ╰─ closeTag(div).value "div"
- │   │  ││           │╰─ closeTag(div) "</div>"
- │   │  ││           ╰─ text
+ │   │  ││     │ │   ││ ╰─ closeTag(div).value "div"
+ │   │  ││     │ │   │╰─ closeTag(div) "</div>"
+ │   │  ││     │ │   ╰─ text
+ │   │  ││     │ ╰─ placeholder:escape.value "xyz"
+ │   │  ││     ╰─ placeholder:escape "${xyz}"
  │   │  │╰─ text "Hello "
  │   │  ╰─ openTagEnd
  ╰─  ╰─ tagName "div"
diff --git a/src/__tests__/fixtures/placeholder-escape/__snapshots__/placeholder-escape.expected.txt b/src/__tests__/fixtures/placeholder-escape/__snapshots__/placeholder-escape.expected.txt
@@ -5,7 +5,9 @@
  │   │      ╰─ attrName "name"
  ╰─  ╰─ tagName "custom"
 2╭─     Hello ${name}!
- │  │                ╰─ text "!\n"
+ │  │         │ │    ╰─ text "!\n"
+ │  │         │ ╰─ placeholder:escape.value "name"
+ │  │         ╰─ placeholder:escape "${name}"
  ╰─ ╰─ text "\n    Hello "
 3╭─ </custom>
  │  │ ╰─ closeTag(custom).value "custom"
diff --git a/src/__tests__/fixtures/placeholder-no-escape/__snapshots__/placeholder-no-escape.expected.txt b/src/__tests__/fixtures/placeholder-no-escape/__snapshots__/placeholder-no-escape.expected.txt
@@ -5,7 +5,9 @@
  │   │      ╰─ attrName "name"
  ╰─  ╰─ tagName "custom"
 2╭─     Hello $!{name}!
- │  │                 ╰─ text "!\n"
+ │  │         │  │    ╰─ text "!\n"
+ │  │         │  ╰─ placeholder.value "name"
+ │  │         ╰─ placeholder "$!{name}"
  ╰─ ╰─ text "\n    Hello "
 3╭─ </custom>
  │  │ ╰─ closeTag(custom).value "custom"
diff --git a/src/__tests__/fixtures/placeholder-within-placeholder-escaping/__snapshots__/placeholder-within-placeholder-escaping.expected.txt b/src/__tests__/fixtures/placeholder-within-placeholder-escaping/__snapshots__/placeholder-within-placeholder-escaping.expected.txt
@@ -1 +1,3 @@
-1╰─ -- $!{"Hello ${data.name}!"}
+1╭─ -- $!{"Hello ${data.name}!"}
+ │     │  ╰─ placeholder.value "\"Hello ${data.name}!\""
+ ╰─    ╰─ placeholder "$!{\"Hello ${data.name}!\"}"
diff --git a/src/__tests__/fixtures/placeholder-within-placeholder/__snapshots__/placeholder-within-placeholder.expected.txt b/src/__tests__/fixtures/placeholder-within-placeholder/__snapshots__/placeholder-within-placeholder.expected.txt
@@ -1 +1,3 @@
-1╰─ -- ${"Hello ${data.name}!"}
+1╭─ -- ${"Hello ${data.name}!"}
+ │     │ ╰─ placeholder:escape.value "\"Hello ${data.name}!\""
+ ╰─    ╰─ placeholder:escape "${\"Hello ${data.name}!\"}"
diff --git a/src/__tests__/fixtures/placeholder-within-script-tag/__snapshots__/placeholder-within-script-tag.expected.txt b/src/__tests__/fixtures/placeholder-within-script-tag/__snapshots__/placeholder-within-script-tag.expected.txt
@@ -1,7 +1,9 @@
 1╭─ <script>Hello ${xyz}!</script>
- │   │     ││           ││ ╰─ closeTag(script).value "script"
- │   │     ││           │╰─ closeTag(script) "</script>"
- │   │     ││           ╰─ text
+ │   │     ││     │ │   ││ ╰─ closeTag(script).value "script"
+ │   │     ││     │ │   │╰─ closeTag(script) "</script>"
+ │   │     ││     │ │   ╰─ text
+ │   │     ││     │ ╰─ placeholder:escape.value "xyz"
+ │   │     ││     ╰─ placeholder:escape "${xyz}"
  │   │     │╰─ text "Hello "
  │   │     ╰─ openTagEnd
  ╰─  ╰─ tagName "script"
diff --git a/src/__tests__/fixtures/placeholder-within-script-within-string/__snapshots__/placeholder-within-script-within-string.expected.txt b/src/__tests__/fixtures/placeholder-within-script-within-string/__snapshots__/placeholder-within-script-within-string.expected.txt
@@ -1,7 +1,9 @@
 1╭─ <script>alert("Hello ${xyz}!")</script>
- │   │     ││                  │  │ ╰─ closeTag(script).value "script"
- │   │     ││                  │  ╰─ closeTag(script) "</script>"
- │   │     ││                  ╰─ text "!\")"
+ │   │     ││            │ │   │  │ ╰─ closeTag(script).value "script"
+ │   │     ││            │ │   │  ╰─ closeTag(script) "</script>"
+ │   │     ││            │ │   ╰─ text "!\")"
+ │   │     ││            │ ╰─ placeholder:escape.value "xyz"
+ │   │     ││            ╰─ placeholder:escape "${xyz}"
  │   │     │╰─ text "alert(\"Hello "
  │   │     ╰─ openTagEnd
  ╰─  ╰─ tagName "script"
diff --git a/src/__tests__/fixtures/script-escaped-placeholder/__snapshots__/script-escaped-placeholder.expected.txt b/src/__tests__/fixtures/script-escaped-placeholder/__snapshots__/script-escaped-placeholder.expected.txt
@@ -4,7 +4,9 @@
 2╭─ \${test}
  │  │╰─ text "${test}\n\\"
  ╰─ ╰─ text "\n"
-3├─ \\${test}
+3╭─ \\${test}
+ │    │ ╰─ placeholder:escape.value "test"
+ ╰─   ╰─ placeholder:escape "${test}"
 4╭─ </script>
  │  │ ╰─ closeTag(script).value "script"
  │  ├─ text "\n"
diff --git a/src/__tests__/fixtures/script-tag-entities/__snapshots__/script-tag-entities.expected.txt b/src/__tests__/fixtures/script-tag-entities/__snapshots__/script-tag-entities.expected.txt
@@ -1,7 +1,9 @@
 1╭─ <script>console.log('<div>Hello ${input.name}</div>');</script>
- │   │     ││                                    │        │ ╰─ closeTag(script).value "script"
- │   │     ││                                    │        ╰─ closeTag(script) "</script>"
- │   │     ││                                    ╰─ text "</div>');"
+ │   │     ││                       │ │          │        │ ╰─ closeTag(script).value "script"
+ │   │     ││                       │ │          │        ╰─ closeTag(script) "</script>"
+ │   │     ││                       │ │          ╰─ text "</div>');"
+ │   │     ││                       │ ╰─ placeholder:escape.value "input.name"
+ │   │     ││                       ╰─ placeholder:escape "${input.name}"
  │   │     │╰─ text "console.log('<div>Hello "
  │   │     ╰─ openTagEnd
  ╰─  ╰─ tagName "script"
diff --git a/src/__tests__/fixtures/shorthand-closing-html/__snapshots__/shorthand-closing-html.expected.txt b/src/__tests__/fixtures/shorthand-closing-html/__snapshots__/shorthand-closing-html.expected.txt
@@ -14,6 +14,8 @@
  │  │    ╰─ tagName
  ╰─ ╰─ text "\n    "
 3╭─         ${title}
+ │  │       │ ╰─ placeholder:escape.value "title"
+ │  │       ╰─ placeholder:escape "${title}"
  ╰─ ╰─ text "\n        "
 4╭─     </a>
  │  │   │ ╰─ closeTag(a).value
diff --git a/src/__tests__/fixtures/tag-var-with-params/__snapshots__/tag-var-with-params.expected.txt b/src/__tests__/fixtures/tag-var-with-params/__snapshots__/tag-var-with-params.expected.txt
@@ -6,6 +6,8 @@
  │   │  ╰─ tagVar "/var"
  ╰─  ╰─ tagName "foo"
 2╭─   Hello ${param}
+ │  │       │ ╰─ placeholder:escape.value "param"
+ │  │       ╰─ placeholder:escape "${param}"
  ╰─ ╰─ text "\n  Hello "
 3╭─ </foo>
  │  │ ╰─ closeTag(foo).value "foo"
diff --git a/src/__tests__/main.test.ts b/src/__tests__/main.test.ts
@@ -66,6 +66,9 @@ for (const entry of fs.readdirSync(FIXTURES)) {
       onText(range) {
         addRange("text", range);
       },
+      onPlaceholder(range) {
+        addValueRange(`placeholder${range.escape ? ":escape" : ""}`, range);
+      },
       onCDATA(range) {
         addValueRange("cdata", range);
       },
