Fix regression in expressions (#937)

* add test * check expressions' first child siblings are empty * chore: changeset * simplify changeset
withastro · Jan 9, 2024 · 7a07089 · 7a07089
1 parent 5658fbd
commit 7a07089
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.changeset/strong-chairs-walk.md b/.changeset/strong-chairs-walk.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fixes a bug where expressions starting with whitespace, followed by anything else, weren't printed correctly.
diff --git a/internal/printer/print-to-js.go b/internal/printer/print-to-js.go
@@ -316,11 +316,7 @@ func render1(p *printer, n *Node, opts RenderOptions) {
 
 	// Tip! Comment this block out to debug expressions
 	if n.Expression {
-		clean := ""
-		if n.FirstChild != nil {
-			clean = strings.TrimSpace(n.FirstChild.Data)
-		}
-		if n.FirstChild == nil || clean == "" {
+		if n.FirstChild == nil || emptyTextNodeWithoutSiblings(n.FirstChild) {
 			p.print("${(void 0)")
 		} else if expressionOnlyHasComment(n) {
 			// we do not print expressions that only contain comment blocks

diff --git a/internal/printer/printer_test.go b/internal/printer/printer_test.go
@@ -2486,6 +2486,20 @@ const items = ["Dog", "Cat", "Platipus"];
 				code: `${$$maybeRenderHead($$result)}<body>(${(void 0)   })</body>`,
 			},
 		},
+		{
+			name: "expression with leading whitespace",
+			source: `<section>
+<ul class="font-mono text-sm flex flex-col gap-0.5">
+	{
+		<li>Build: { new Date().toISOString() }</li>
+		<li>NODE_VERSION: { process.env.NODE_VERSION }</li>
+	}
+</ul>
+</section>`,
+			want: want{
+				code: "${$$maybeRenderHead($$result)}<section>\n<ul class=\"font-mono text-sm flex flex-col gap-0.5\">\n\t${\n\n\t\t$$render`<li>Build: ${ new Date().toISOString() }</li>\n\t\t<li>NODE_VERSION: ${ process.env.NODE_VERSION }</li>`\n\t}\n</ul>\n</section>",
+			},
+		},
 		{
 			name:   "Empty attribute expression",
 			source: "<body attr={}></body>",