fix: format expression (#150)

withastro · Mar 23, 2022 · 0ed661a · 0ed661a
1 parent 87b0508
commit 0ed661a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 20 deletions.
diff --git a/.changeset/great-months-perform.md b/.changeset/great-months-perform.md
@@ -0,0 +1,5 @@
+---
+'prettier-plugin-astro': patch
+---
+
+Fix: Format expression
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "format": "prettier -w ."
   },
   "dependencies": {
-    "@astrojs/compiler": "^0.12.1",
+    "@astrojs/compiler": "^0.13.1",
     "make-synchronous": "0.1.1",
     "prettier": "^2.4.1",
     "sass-formatter": "^0.7.2"

diff --git a/src/printer.ts b/src/printer.ts
@@ -525,20 +525,16 @@ function embed(
   if (!node) return null;
 
   if (node.type === 'expression') {
-    const textContent = getText(node, opts);
-
-    let content: Doc | string;
-
-    if (node.children.length === 1) {
-      content = textContent;
-    } else {
-      content = textToDoc(textContent, {
-        ...opts,
-        parser: 'babel-ts',
-        semi: false,
-      });
-      content = stripTrailingHardline(content);
-    }
+    const textContent = printRaw(node);
+
+    let content: Doc;
+
+    content = textToDoc(forceIntoExpression(textContent), {
+      ...opts,
+      parser: expressionParser,
+      semi: false,
+    });
+    content = stripTrailingHardline(content);
 
     // if (node.children[0].value) {
     //   content = textToDoc(forceIntoExpression(textContent), { parser: expressionParser });

diff --git a/src/utils.ts b/src/utils.ts
@@ -179,7 +179,10 @@ export function printRaw(
     return '';
   }
 
-  let raw = node.children.reduce((prev, curr) => prev + serialize(curr), '');
+  let raw = node.children.reduce(
+    (prev: string, curr: Node) => prev + serialize(curr),
+    ''
+  );
 
   if (!stripLeadingAndTrailingNewline) {
     return raw;

diff --git a/test/fixtures/binary-expression/input.astro b/test/fixtures/binary-expression/input.astro
@@ -0,0 +1,4 @@
+
+          <h1>
+           { 1  +   2}</h1>
+
diff --git a/test/fixtures/binary-expression/output.astro b/test/fixtures/binary-expression/output.astro
@@ -0,0 +1,3 @@
+<h1>
+  {1 + 2}
+</h1>
diff --git a/test/tests/other.test.ts b/test/tests/other.test.ts
@@ -59,3 +59,5 @@ test(
 test('Format spread operator', 'spread-operator');
 
 test('Can format nested comment', 'nested-comment');
+
+test('format binary expressions', 'binary-expression');
diff --git a/yarn.lock b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@astrojs/compiler@^0.12.1":
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/@astrojs/compiler/-/compiler-0.12.1.tgz#163744036c2c2a278cced594a28a9631b69b7127"
-  integrity sha512-XpKZyJlnDhszulwwse/1uV+ZiyTpg6xNH5TrriYDVdzB8dUbQLdE7tX4Cxhdw5QrJpV57AaPrPXvJKi1jnIkxw==
+"@astrojs/compiler@^0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@astrojs/compiler/-/compiler-0.13.1.tgz#ec261e3be67765319b62f164f3e6022d52102203"
+  integrity sha512-iRAwvJ8/uVRtK/4ofSYKx4MTsuG8YjSgz8Lti7tPGoFaQzSNEU8J5cXvpTSV/F2SspSWB9EHjk2v7204pOxlrQ==
   dependencies:
     tsm "^2.2.1"
     uvu "^0.5.3"
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    <h1>
+      {1 + 2}
+    </h1>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,3 +59,5 @@ test(
		test('Format spread operator', 'spread-operator');

		test('Can format nested comment', 'nested-comment');

		test('format binary expressions', 'binary-expression');