Handle string templates within expressions (#91)

* Handle string templates within expressions * Adds a changeset
withastro · Oct 22, 2021 · f262b61 · f262b61
1 parent 23298d2
commit f262b61
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/.changeset/fifty-houses-film.md b/.changeset/fifty-houses-film.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix for string template usage within expressions
diff --git a/internal/token.go b/internal/token.go
@@ -1328,6 +1328,9 @@ func (z *Tokenizer) Next() TokenType {
 	if z.fm != FrontmatterClosed {
 		goto frontmatter_loop
 	}
+	if len(z.expressionStack) > 0 {
+		goto expression_loop
+	}
 
 loop:
 	for {

diff --git a/internal/token_test.go b/internal/token_test.go
@@ -358,6 +358,11 @@ func TestExpressions(t *testing.T) {
 			"<title>{content.title && `${title} 🚀 ${title}`}</title>",
 			[]TokenType{StartTagToken, StartExpressionToken, TextToken, EndExpressionToken, EndTagToken},
 		},
+		{
+			"Nested use of string templates inside expressions",
+			"<div>{`${a} inner${a > 1 ? 's' : ''}.`}</div>",
+			[]TokenType{StartTagToken, StartExpressionToken, TextToken, EndExpressionToken, EndTagToken},
+		},
 	}
 
 	runTokenTypeTest(t, Expressions)