fix regression for inLiteralIM handling (#627)

natemoo-re · web-flow · commit 6ff1d802a31f · 2022-11-14T10:15:54.000-06:00
* fix: improve literalIM handling

* chore: remove console

Co-authored-by: Nate Moore &lt;nate@astro.build&gt;
diff --git a/.changeset/cold-mice-stare.md b/.changeset/cold-mice-stare.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix regression introduced by https://github.com/withastro/compiler/pull/617
diff --git a/internal/parser.go b/internal/parser.go
@@ -686,6 +686,7 @@ func beforeHTMLIM(p *parser) bool {
 		}
 		if p.literal {
 			p.im = inLiteralIM
+			p.originalIM = beforeHTMLIM
 			return false
 		}
 	case EndTagToken:
@@ -784,10 +785,8 @@ func inHeadIM(p *parser) bool {
 		// Allow components in Head
 		if isComponent(p.tok.Data) || isFragment(p.tok.Data) {
 			p.im = inLiteralIM
-			oe := len(p.oe)
-			p.exitLiteralIM = func() bool {
-				return len(p.oe) == oe
-			}
+			p.originalIM = inHeadIM
+			p.exitLiteralIM = getExitLiteralFunc(p)
 			return false
 		}
 		switch p.tok.DataAtom {
@@ -1116,6 +1115,7 @@ func inBodyIM(p *parser) bool {
 		// if literal and we only have html and body open
 		if p.literal {
 			p.im = inLiteralIM
+			p.originalIM = inBodyIM
 			return false
 		}
 		// It's possible we were moved here from inHeadIM
@@ -2435,6 +2435,7 @@ func afterBodyIM(p *parser) bool {
 	case EndTagToken:
 		if p.literal {
 			p.im = inLiteralIM
+			p.originalIM = afterBodyIM
 			return false
 		}
 		if p.tok.DataAtom == a.Html {
@@ -2755,13 +2756,9 @@ func ignoreTheRemainingTokens(p *parser) bool {
 
 // Generate a function that will exit `inLiteralIM` when all expressions are closed
 func getExitLiteralFunc(p *parser) func() bool {
+	oe := len(p.oe)
 	return func() bool {
-		for _, n := range p.oe {
-			if n.Expression {
-				return false
-			}
-		}
-		return true
+		return len(p.oe) == oe
 	}
 }
 
diff --git a/packages/compiler/test/basic/body-after-head-component.ts b/packages/compiler/test/basic/body-after-head-component.ts
@@ -0,0 +1,29 @@
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+import { transform } from '@astrojs/compiler';
+
+const FIXTURE = `
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <TestHead />
+    <title>document</title>
+  </head>
+  <body>
+    <main>
+       <h1>Welcome to <span class="text-gradient">Astro</span></h1>
+    </main>
+  </body>
+</html>
+`;
+
+let result;
+test.before(async () => {
+  result = await transform(FIXTURE);
+});
+
+test('has body in output', () => {
+  assert.match(result.code, '<body>', 'Expected output to contain body element!');
+});
+
+test.run();

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@astrojs/compiler': patch
 +---
++
 +Fix regression introduced by https://github.com/withastro/compiler/pull/617