Preserve tag case (#19)

withastro · Oct 3, 2021 · 4b76988 · 4b76988
1 parent 333a10a
commit 4b76988
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/src/printer.js b/src/printer.js
@@ -108,7 +108,8 @@ const print = (path, opts, print) => {
       }
       // If we don't see any JSX expressions, this is just embedded HTML
       // and we can skip a bunch of work. Hooray!
-      if (text.indexOf('{') === -1) {
+      const hasInlineComponent = node.children.filter((x) => x.type === 'InlineComponent').length > 0;
+      if (text.indexOf('{') === -1 && !hasInlineComponent) {
         node.__isRawHTML = true;
         node.content = text;
         return path.call(print);
@@ -395,6 +396,15 @@ const embed = (path, print, textToDoc, opts) => {
     return group(['---', hardline, textToDoc(node.content, { ...opts, parser: 'typescript' }), '---', hardline]);
   }
 
+  // format <script type="module"> content
+  if (node.type === 'Text') {
+    const parent = path.getParentNode();
+    if (parent.type === 'Element' && parent.name === 'script') {
+      const [formatttedScript, _] = textToDoc(node.data, { ...opts, parser: 'typescript' });
+      return group(formatttedScript);
+    }
+  }
+
   if (node.type === 'Style') {
     let styleLang = '';
     let parserLang = '';

diff --git a/test/astro-prettier.test.mjs b/test/astro-prettier.test.mjs
@@ -110,7 +110,7 @@ test.failing('an Astro file with an invalidly unclosed tag is still formatted',
 
 test.todo('test whether invalid files provide helpful support messages / still try to be parsed by prettier?');
 
-test.failing('can format an Astro file with components that are the uppercase version of html elements', PrettierUnaltered, 'preserve-tag-case');
+test('can format an Astro file with components that are the uppercase version of html elements', Prettier, 'preserve-tag-case');
 
 test.failing('Autocloses open tags? BUG: RangeError { message: "Maximum call stack size exceeded" }', Prettier, 'maximum-call-size-exceeded');
 

diff --git a/test/fixtures/in/preserve-tag-case.astro b/test/fixtures/in/preserve-tag-case.astro
@@ -1,5 +1,8 @@
 ---
 import Footer from "./Footer.astro";
+import  {Body}  from "lib";
 ---
-<Footer>this is a footer component</Footer>
-<footer>this is a regular footer element</footer>
+
+  <Footer>this is a footer component</Footer>
+  <footer>this is a regular footer element</footer>
+  <Body></Body>
diff --git a/test/fixtures/in/with-script.astro b/test/fixtures/in/with-script.astro
@@ -1,5 +1,8 @@
 <script type="module">
 import confetti from 'https://cdn.skypack.dev/canvas-confetti';
-
-confetti();
+    console.log("lorem")
+  function foo() {
+      return 0
+  }
+    confetti();
 </script>
diff --git a/test/fixtures/out/preserve-tag-case.astro b/test/fixtures/out/preserve-tag-case.astro
@@ -1,6 +1,8 @@
 ---
 import Footer from "./Footer.astro";
+import { Body } from "lib";
 ---
 
 <Footer>this is a footer component</Footer>
 <footer>this is a regular footer element</footer>
+<Body />
diff --git a/test/fixtures/out/with-script.astro b/test/fixtures/out/with-script.astro
@@ -1,5 +1,8 @@
 <script type="module">
   import confetti from "https://cdn.skypack.dev/canvas-confetti";
-
+  console.log("lorem");
+  function foo() {
+    return 0;
+  }
   confetti();
 </script>