{a}
+```
+
+## Output
+
+```json
+{"type":"root","children":[{"type":"frontmatter","value":"\nconst a = \"hey\"\n"},{"type":"element","name":"div","attributes":[],"children":[{"type":"expression","children":[{"type":"text","value":"a"}]}]}]}
+```
+---
diff --git a/internal/printer/__printer_json__/JSON_escape.snap b/internal/printer/__printer_json__/JSON_escape.snap
new file mode 100755
index 000000000..876b4117a
--- /dev/null
+++ b/internal/printer/__printer_json__/JSON_escape.snap
@@ -0,0 +1,19 @@
+
+[TestPrintToJSON/JSON_escape - 1]
+## Input
+
+```
+/-/-/-/
+const a = "\n"
+const b = "\""
+const c = '\''
+/-/-/-/
+{a + b + c}
+```
+
+## Output
+
+```json
+{"type":"root","children":[{"type":"frontmatter","value":"\nconst a = \"\\n\"\nconst b = \"\\\"\"\nconst c = '\\''\n"},{"type":"expression","children":[{"type":"text","value":"a + b + c"}]}]}
+```
+---
diff --git a/internal/printer/__printer_json__/Preserve_namespaces.snap b/internal/printer/__printer_json__/Preserve_namespaces.snap
new file mode 100755
index 000000000..034f752a0
--- /dev/null
+++ b/internal/printer/__printer_json__/Preserve_namespaces.snap
@@ -0,0 +1,14 @@
+
+[TestPrintToJSON/Preserve_namespaces - 1]
+## Input
+
+```
+
+```
+
+## Output
+
+```json
+{"type":"root","children":[{"type":"element","name":"svg","attributes":[{"type":"attribute","kind":"quoted","name":"xmlns","value":"http://www.w3.org/2000/svg","raw":"\"http://www.w3.org/2000/svg\""},{"type":"attribute","kind":"quoted","name":"xmlns:xlink","value":"http://www.w3.org/1999/xlink","raw":"\"http://www.w3.org/1999/xlink\""}],"children":[{"type":"element","name":"rect","attributes":[{"type":"attribute","kind":"quoted","name":"xlink:href","value":"#id","raw":"\"#id\""}],"children":[]}]}]}
+```
+---
diff --git a/internal/printer/__printer_json__/basic.snap b/internal/printer/__printer_json__/basic.snap
new file mode 100755
index 000000000..a52e1917d
--- /dev/null
+++ b/internal/printer/__printer_json__/basic.snap
@@ -0,0 +1,14 @@
+
+[TestPrintToJSON/basic - 1]
+## Input
+
+```
+Hello world!
+``` + +## Output + +```json +{"type":"root","children":[{"type":"element","name":"h1","attributes":[],"children":[{"type":"text","value":"Hello world!"}]}]} +``` +--- diff --git a/internal/printer/__printer_json__/custom-element.snap b/internal/printer/__printer_json__/custom-element.snap new file mode 100755 index 000000000..ddeb7e459 --- /dev/null +++ b/internal/printer/__printer_json__/custom-element.snap @@ -0,0 +1,14 @@ + +[TestPrintToJSON/custom-element - 1] +## Input + +``` +Hello {world}
+``` + +## Output + +```json +{"type":"root","children":[{"type":"element","name":"h1","attributes":[],"children":[{"type":"text","value":"Hello "},{"type":"expression","children":[{"type":"text","value":"world"}]}]}]} +``` +--- diff --git a/internal/printer/__printer_json__/style_after_body_with_component_in_head_and_body.snap b/internal/printer/__printer_json__/style_after_body_with_component_in_head_and_body.snap new file mode 100755 index 000000000..53a5ce900 --- /dev/null +++ b/internal/printer/__printer_json__/style_after_body_with_component_in_head_and_body.snap @@ -0,0 +1,14 @@ + +[TestPrintToJSON/style_after_body_with_component_in_head_and_body - 1] +## Input + +``` +Hello world!
+``` + +## Output + +```json +{"type":"root","children":[{"type":"element","name":"html","attributes":[],"children":[{"type":"element","name":"body","attributes":[],"children":[{"type":"element","name":"h1","attributes":[],"children":[{"type":"text","value":"Hello world!"}]}]}]},{"type":"element","name":"style","attributes":[],"children":[]}]} +``` +--- diff --git a/internal/printer/__printer_json__/style_after_html_with_component_in_head.snap b/internal/printer/__printer_json__/style_after_html_with_component_in_head.snap new file mode 100755 index 000000000..41fd3c33b --- /dev/null +++ b/internal/printer/__printer_json__/style_after_html_with_component_in_head.snap @@ -0,0 +1,14 @@ + +[TestPrintToJSON/style_after_html_with_component_in_head - 1] +## Input + +``` +Hello world!
+``` + +## Output + +```json +{"type":"root","children":[{"type":"element","name":"style","attributes":[],"children":[]},{"type":"element","name":"html","attributes":[],"children":[{"type":"element","name":"body","attributes":[],"children":[{"type":"element","name":"h1","attributes":[],"children":[{"type":"text","value":"Hello world!"}]}]}]}]} +``` +--- diff --git a/internal/printer/__printer_json__/style_in_body.snap b/internal/printer/__printer_json__/style_in_body.snap new file mode 100755 index 000000000..cedebcd7d --- /dev/null +++ b/internal/printer/__printer_json__/style_in_body.snap @@ -0,0 +1,14 @@ + +[TestPrintToJSON/style_in_body - 1] +## Input + +``` +Hello world!
+``` + +## Output + +```json +{"type":"root","children":[{"type":"element","name":"html","attributes":[],"children":[{"type":"element","name":"body","attributes":[],"children":[{"type":"element","name":"h1","attributes":[],"children":[{"type":"text","value":"Hello world!"}]},{"type":"element","name":"style","attributes":[],"children":[]}]}]}]} +``` +--- diff --git a/internal/printer/__printer_json__/style_in_html.snap b/internal/printer/__printer_json__/style_in_html.snap new file mode 100755 index 000000000..ab1e6941d --- /dev/null +++ b/internal/printer/__printer_json__/style_in_html.snap @@ -0,0 +1,14 @@ + +[TestPrintToJSON/style_in_html - 1] +## Input + +``` +Hello world!
+``` + +## Output + +```json +{"type":"root","children":[{"type":"element","name":"html","attributes":[],"children":[{"type":"element","name":"body","attributes":[],"children":[{"type":"element","name":"h1","attributes":[],"children":[{"type":"text","value":"Hello world!"}]}]},{"type":"element","name":"style","attributes":[],"children":[]}]}]} +``` +--- diff --git a/internal/printer/printer_css_test.go b/internal/printer/printer_css_test.go index 78e554b4a..25d8ff12d 100644 --- a/internal/printer/printer_css_test.go +++ b/internal/printer/printer_css_test.go @@ -13,7 +13,6 @@ import ( type testcase_css struct { name string source string - want string scopedStyleStrategy string } @@ -34,7 +33,6 @@ func TestPrinterCSS(t *testing.T) {Page Title
I’m a page
`, - want: ".title:where(.astro-dpohflym){font-family:fantasy;font-size:28px}.body:where(.astro-dpohflym){font-size:1em}", }, { name: "scopedStyleStrategy: 'class'", @@ -52,7 +50,6 @@ func TestPrinterCSS(t *testing.T) {Page Title
I’m a page
`, scopedStyleStrategy: "class", - want: ".title.astro-dpohflym{font-family:fantasy;font-size:28px}.body.astro-dpohflym{font-size:1em}", }, { name: "scopedStyleStrategy: 'attribute'", @@ -70,7 +67,6 @@ func TestPrinterCSS(t *testing.T) {Page Title
I’m a page
`, scopedStyleStrategy: "attribute", - want: ".title[data-astro-cid-dpohflym]{font-family:fantasy;font-size:28px}.body[data-astro-cid-dpohflym]{font-size:1em}", }, } @@ -102,12 +98,15 @@ func TestPrinterCSS(t *testing.T) { output += string(bytes) } - toMatch := tt.want - - // compare to expected string, show diff if mismatch - if diff := test_utils.ANSIDiff(test_utils.Dedent(toMatch), test_utils.Dedent(output)); diff != "" { - t.Errorf("mismatch (-want +got):\n%s", diff) - } + test_utils.MakeSnapshot( + &test_utils.SnapshotOptions{ + Testing: t, + TestCaseName: tt.name, + Input: code, + Output: output, + Kind: test_utils.CssOutput, + FolderName: "__printer_css__", + }) }) } } diff --git a/internal/printer/printer_test.go b/internal/printer/printer_test.go index 2c2e6af8d..0089ea34f 100644 --- a/internal/printer/printer_test.go +++ b/internal/printer/printer_test.go @@ -2,12 +2,9 @@ package printer import ( "fmt" - "regexp" - "strconv" "strings" "testing" - "github.com/gkampitakis/go-snaps/snaps" astro "github.com/withastro/compiler/internal" "github.com/withastro/compiler/internal/handler" types "github.com/withastro/compiler/internal/t" @@ -82,13 +79,11 @@ type testcase struct { transitions bool transformOptions transform.TransformOptions filename string - want want } type jsonTestcase struct { name string source string - want []ASTNode only bool } @@ -102,107 +97,62 @@ func TestPrinter(t *testing.T) { { name: "text only", source: `Foo`, - want: want{ - code: `Foo`, - }, }, { name: "unusual line terminator I", source: `Pre-set & Time-limited \u2028holiday campaigns`, - want: want{ - code: `Pre-set & Time-limited \\u2028holiday campaigns`, - }, }, { name: "unusual line terminator II", source: `Pre-set & Time-limited holiday campaigns`, - want: want{ - code: `Pre-set & Time-limited holiday campaigns`, - }, }, { name: "basic (no frontmatter)", source: ``, - want: want{ - code: `${$$maybeRenderHead($$result)}`, - }, }, { name: "basic renderHead", source: `Special
Not special
}`, - want: want{ - code: `${special ? $$render` + BACKTICK + `${$$renderComponent($$result,'ChildDiv',ChildDiv,{},{"default": () => $$render` + BACKTICK + `${$$maybeRenderHead($$result)}Special
` + BACKTICK + `,})}` + BACKTICK + ` : $$render` + BACKTICK + `Not special
` + BACKTICK + `}`, - }, }, { name: "ternary layout", source: `{toggleError ?SITE: {Astro.site}
SITE: {Astro.site}
}`, - want: want{ - code: `${toggleError ? $$render` + BACKTICK + `${$$renderComponent($$result,'BaseLayout',BaseLayout,{},{"default": () => $$render` + BACKTICK + `${$$maybeRenderHead($$result)}SITE: ${Astro.site}
` + BACKTICK + `,})}` + BACKTICK + ` : $$render` + BACKTICK + `${$$renderComponent($$result,'Fragment',Fragment,{},{"default": () => $$render` + BACKTICK + `SITE: ${Astro.site}
` + BACKTICK + `,})}` + BACKTICK + `}`, - }, }, { name: "orphan slot", source: `foo
}foo
`}`,})}",
- },
},
{
name: "ternary slot",
source: `A
: B
}A
`} : {\"b\": () => $$render`B
`}))}",
- },
},
{
name: "function expression slots I",
source: "A
\ncase 'b': return B
\ncase 'c': return C
\n}\n}}\nA
`}\ncase 'b': return {\"b\": () => $$render`B
`}\ncase 'c': return {\"c\": () => $$render`C
`}}\n}))}",
- },
},
{
name: "function expression slots II (#959)",
@@ -220,62 +170,30 @@ func TestPrinter(t *testing.T) {