Fix typo (#170)

* fix: component only edge case * test: update tests to hopefully catch more edge cases * chore: fix lint
withastro · Nov 23, 2021 · eb0d17f · eb0d17f
1 parent a1bdbf7
commit eb0d17f
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 3 deletions.
diff --git a/.changeset/early-tips-lick.md b/.changeset/early-tips-lick.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix edge case with files that contain a single component
diff --git a/internal/transform/transform.go b/internal/transform/transform.go
@@ -184,7 +184,7 @@ func hasSiblings(n *tycho.Node) bool {
 
 	if sibling := n.PrevSibling; sibling != nil {
 		if sibling.Type == tycho.TextNode {
-			return strings.TrimSpace(n.NextSibling.Data) != ""
+			return strings.TrimSpace(n.PrevSibling.Data) != ""
 		} else {
 			return sibling.Type != tycho.CommentNode
 		}

diff --git a/internal/transform/transform_test.go b/internal/transform/transform_test.go
@@ -154,6 +154,11 @@ func TestFullTransform(t *testing.T) {
 			source: `<Component />`,
 			want:   `<Component></Component>`,
 		},
+		{
+			name:   "",
+			source: `<style></style><A><div><B /></div></A>`,
+			want:   `<A><div><B></B></div></A>`,
+		},
 	}
 	var b strings.Builder
 	for _, tt := range tests {

diff --git a/lib/compiler/test/component-only.test.mjs b/lib/compiler/test/component-only.test.mjs
@@ -0,0 +1,62 @@
+/* eslint-disable no-console */
+
+import { transform } from '@astrojs/compiler';
+import sass from 'sass';
+
+function transformSass(value) {
+  return new Promise((resolve, reject) => {
+    sass.render({ data: value }, (err, result) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      resolve({ code: result.css.toString('utf8'), map: result.map });
+      return;
+    });
+  });
+}
+
+async function run() {
+  const result = await transform(
+    `---
+import { Markdown } from 'astro/components';
+import Layout from '../layouts/content.astro';
+---
+
+<style>
+  #root {
+    color: green;
+  }
+</style>
+
+<Layout>
+  <div id="root">
+    <Markdown>
+      ## Interesting Topic
+    </Markdown>
+  </div>
+</Layout>`, // NOTE: the lack of trailing space is important to this test!
+    {
+      sourcemap: true,
+      preprocessStyle: async (value, attrs) => {
+        if (attrs.lang === 'scss') {
+          try {
+            return transformSass(value);
+          } catch (err) {
+            console.error(err);
+          }
+        }
+        return null;
+      },
+      as: 'document',
+    }
+  );
+
+  console.log(result.code);
+
+  if (result.code.includes('html')) {
+    throw new Error('Result did not remove <html>');
+  }
+}
+
+await run();
diff --git a/lib/compiler/test/empty-style.test.mjs b/lib/compiler/test/empty-style.test.mjs
@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+
 import { transform } from '@astrojs/compiler';
 import sass from 'sass';
 
@@ -43,8 +45,6 @@ let value = 'world';
       },
     }
   );
-
-  console.log(result);
 }
 
 await run();
diff --git a/lib/compiler/test/test.mjs b/lib/compiler/test/test.mjs
@@ -1,3 +1,4 @@
 import './basic.test.mjs';
+import './component-only.test.mjs';
 import './empty-style.test.mjs';
 import './output.test.mjs';