Merge pull request #2 from marko-js/issue-1

fix: issue printing destructured tag params
marko-js · Oct 13, 2021 · 6451e1f · 6451e1f
2 parents 7582c5c + f9db3b2
commit 6451e1f
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 2 deletions.
diff --git a/src/__tests__/__snapshots__/params-destructured.expected/auto.marko b/src/__tests__/__snapshots__/params-destructured.expected/auto.marko
@@ -0,0 +1,11 @@
+<macro name="recursive">
+  <await(generator.next())>
+    <@then|{ value, done }|>
+      <div>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+      </div>
+    </@then>
+  </await>
+</macro>
diff --git a/src/__tests__/__snapshots__/params-destructured.expected/concise.marko b/src/__tests__/__snapshots__/params-destructured.expected/concise.marko
@@ -0,0 +1,10 @@
+macro name="recursive"
+  await(generator.next())
+    @then|{ value, done }|
+      div
+        ul
+          li -- ${value}
+        ul
+          li -- ${value}
+        ul
+          li -- ${value}
diff --git a/src/__tests__/__snapshots__/params-destructured.expected/html.marko b/src/__tests__/__snapshots__/params-destructured.expected/html.marko
@@ -0,0 +1,11 @@
+<macro name="recursive">
+  <await(generator.next())>
+    <@then|{ value, done }|>
+      <div>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+      </div>
+    </@then>
+  </await>
+</macro>
diff --git a/src/__tests__/__snapshots__/params-destructured.expected/with-parens.marko b/src/__tests__/__snapshots__/params-destructured.expected/with-parens.marko
@@ -0,0 +1,11 @@
+<macro name="recursive">
+  <await(generator.next())>
+    <@then|{ value, done }|>
+      <div>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+      </div>
+    </@then>
+  </await>
+</macro>
diff --git a/src/__tests__/fixtures/params-destructured.marko b/src/__tests__/fixtures/params-destructured.marko
@@ -0,0 +1,11 @@
+<macro name="recursive">
+  <await(generator.next())>
+    <@then|{ value, done }|>
+      <div>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+        <ul><li>${value}</li></ul>
+      </div>
+    </@then>
+  </await>
+</macro>
diff --git a/src/index.ts b/src/index.ts
@@ -600,8 +600,11 @@ export const printers: Record<string, Printer<Node>> = {
                 "__js_expression",
                 (doc: any) => {
                   const { contents } = doc.contents[0];
-                  if (Array.isArray(contents) && contents[0] === "(") {
-                    return contents.slice(1, -1);
+                  if (Array.isArray(contents) && contents[0].startsWith("(")) {
+                    contents[0] = contents[0].slice(1);
+                    contents[contents.length - 1] = contents[
+                      contents.length - 1
+                    ].slice(0, -1);
                   }
 
                   return contents;