fix: better follow prettiers trailingComma config (#39)

marko-js · Jun 16, 2023 · 0c0f507 · 0c0f507
1 parent 8eb2d7a
commit 0c0f507
Show file tree

Hide file tree

Showing 22 changed files with 136 additions and 18 deletions.
diff --git a/src/__tests__/__snapshots__/argument-attr.expected/auto.marko b/src/__tests__/__snapshots__/argument-attr.expected/auto.marko
@@ -3,7 +3,7 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
 -- ${test}
 

diff --git a/src/__tests__/__snapshots__/argument-attr.expected/concise.marko b/src/__tests__/__snapshots__/argument-attr.expected/concise.marko
@@ -3,7 +3,7 @@ div foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )
 -- ${test}
 

diff --git a/src/__tests__/__snapshots__/argument-attr.expected/html.marko b/src/__tests__/__snapshots__/argument-attr.expected/html.marko
@@ -3,7 +3,7 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
 -- ${test}
 

diff --git a/src/__tests__/__snapshots__/argument-attr.expected/with-parens.marko b/src/__tests__/__snapshots__/argument-attr.expected/with-parens.marko
@@ -3,7 +3,7 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
 -- ${test}
 

diff --git a/src/__tests__/__snapshots__/argument-tag.expected/auto.marko b/src/__tests__/__snapshots__/argument-tag.expected/auto.marko
@@ -3,6 +3,6 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
 <foo(a, b)/>
diff --git a/src/__tests__/__snapshots__/argument-tag.expected/concise.marko b/src/__tests__/__snapshots__/argument-tag.expected/concise.marko
@@ -3,6 +3,6 @@ foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )
 foo(a, b)
diff --git a/src/__tests__/__snapshots__/argument-tag.expected/html.marko b/src/__tests__/__snapshots__/argument-tag.expected/html.marko
@@ -3,6 +3,6 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
 <foo(a, b)/>
diff --git a/src/__tests__/__snapshots__/argument-tag.expected/with-parens.marko b/src/__tests__/__snapshots__/argument-tag.expected/with-parens.marko
@@ -3,6 +3,6 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
 <foo(a, b)/>
diff --git a/src/__tests__/__snapshots__/attr-with-argument.expected/auto.marko b/src/__tests__/__snapshots__/attr-with-argument.expected/auto.marko
@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
diff --git a/src/__tests__/__snapshots__/attr-with-argument.expected/concise.marko b/src/__tests__/__snapshots__/attr-with-argument.expected/concise.marko
@@ -3,5 +3,5 @@ div foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )
diff --git a/src/__tests__/__snapshots__/attr-with-argument.expected/html.marko b/src/__tests__/__snapshots__/attr-with-argument.expected/html.marko
@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
diff --git a/src/__tests__/__snapshots__/attr-with-argument.expected/with-parens.marko b/src/__tests__/__snapshots__/attr-with-argument.expected/with-parens.marko
@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
diff --git a/src/__tests__/__snapshots__/if-condition.expected/auto.marko b/src/__tests__/__snapshots__/if-condition.expected/auto.marko
@@ -0,0 +1,25 @@
+<if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
+
+<if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
diff --git a/src/__tests__/__snapshots__/if-condition.expected/concise.marko b/src/__tests__/__snapshots__/if-condition.expected/concise.marko
@@ -0,0 +1,23 @@
+if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)
+  person-card [
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  ]
+
+if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)
+  person-card [
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  ]
diff --git a/src/__tests__/__snapshots__/if-condition.expected/html.marko b/src/__tests__/__snapshots__/if-condition.expected/html.marko
@@ -0,0 +1,25 @@
+<if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
+
+<if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
diff --git a/src/__tests__/__snapshots__/if-condition.expected/with-parens.marko b/src/__tests__/__snapshots__/if-condition.expected/with-parens.marko
@@ -0,0 +1,25 @@
+<if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
+
+<if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality
+)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
diff --git a/src/__tests__/__snapshots__/tag-argument.expected/auto.marko b/src/__tests__/__snapshots__/tag-argument.expected/auto.marko
@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
diff --git a/src/__tests__/__snapshots__/tag-argument.expected/concise.marko b/src/__tests__/__snapshots__/tag-argument.expected/concise.marko
@@ -3,5 +3,5 @@ foo(
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )
diff --git a/src/__tests__/__snapshots__/tag-argument.expected/html.marko b/src/__tests__/__snapshots__/tag-argument.expected/html.marko
@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
diff --git a/src/__tests__/__snapshots__/tag-argument.expected/with-parens.marko b/src/__tests__/__snapshots__/tag-argument.expected/with-parens.marko
@@ -3,5 +3,5 @@
   { aaaaaaaaaa: 1, bbbbbbbbbb: 2, cccccccccc: 3 },
   aaaaaaaaaa,
   bbbbbbbbbb,
-  cccccccccc,
+  cccccccccc
 )/>
diff --git a/src/__tests__/fixtures/if-condition.marko b/src/__tests__/fixtures/if-condition.marko
@@ -0,0 +1,20 @@
+<if(thisPerson.address && thisPerson.phone && thisPerson.age && thisPerson.nationality)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
+
+<if(
+  thisPerson.address &&
+  thisPerson.phone &&
+  thisPerson.age &&
+  thisPerson.nationality,
+)>
+  <person-card
+    address=thisPerson.address
+    phone=thisPerson.phone
+    age=thisPerson.age
+  />
+</if>
diff --git a/src/index.ts b/src/index.ts
@@ -363,7 +363,7 @@ export const printers: Record<string, Printer<Node>> = {
                     [",", b.line],
                     tagPath.map((it) => print(it), "arguments")
                   ),
-                  opts.trailingComma ? b.ifBreak(",") : "",
+                  opts.trailingComma === "all" ? b.ifBreak(",") : "",
                 ]),
                 b.softline,
                 ")",
@@ -591,7 +591,7 @@ export const printers: Record<string, Printer<Node>> = {
                       [",", b.line],
                       attrPath.map((it) => print(it), "arguments")
                     ),
-                    opts.trailingComma ? b.ifBreak(",") : "",
+                    opts.trailingComma === "all" ? b.ifBreak(",") : "",
                   ]),
                   b.softline,
                   ")",