Fix regression in generics logic (#491)

* fix: regression in generics logic * chore: add changeset Co-authored-by: Nate Moore <nate@astro.build>
withastro · Aug 5, 2022 · 79376f3 · 79376f3
1 parent 73e07fe
commit 79376f3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.changeset/fast-rules-fix.md b/.changeset/fast-rules-fix.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix regression with expression rendering
diff --git a/internal/printer/printer_test.go b/internal/printer/printer_test.go
@@ -207,6 +207,13 @@ func TestPrinter(t *testing.T) {
 				code: "Hello!",
 			},
 		},
+		{
+			name:   "custom-element",
+			source: "{show && <client-only-element></client-only-element>}",
+			want: want{
+				code: "${show && $$render`${$$renderComponent($$result,'client-only-element','client-only-element',{})}`}",
+			},
+		},
 		{
 			name:   "attribute with template literal",
 			source: "<a :href=\"`/home`\">Home</a>",

diff --git a/internal/token.go b/internal/token.go
@@ -1015,7 +1015,7 @@ func (z *Tokenizer) readStartTag() TokenType {
 			originalLen := len(text)
 			// If this "StartTagToken" does not include any spaces between it and the end of the expression
 			// we can roughly assume it is a TypeScript generic rather than an element. Rough but it works!
-			if len(strings.TrimRightFunc(text, unicode.IsSpace)) == originalLen {
+			if len(text) != 0 && len(strings.TrimRightFunc(text, unicode.IsSpace)) == originalLen {
 				return TextToken
 			}
 		}