fix(combine): don't create an arrayExpression with just one item

merceyz · May 11, 2019 · 699d6f5 · 699d6f5
1 parent b344735
commit 699d6f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/transformers/combineArguments.js b/src/transformers/combineArguments.js
@@ -35,8 +35,13 @@ module.exports = path => {
     const result = [];
 
     if (node.child.type === 'rootNode') {
-      const arr = t.arrayExpression(convertToAST(node.child));
-      result.push(t.logicalExpression('&&', node.node, arr));
+      let right = convertToAST(node.child);
+      if (right.length === 1) {
+        right = right[0];
+      } else {
+        right = t.arrayExpression(right);
+      }
+      result.push(t.logicalExpression('&&', node.node, right));
     } else {
       result.push(t.logicalExpression('&&', node.node, node.child));
     }

diff --git a/test/fixtures/combine-arguments/nested-match/output.js b/test/fixtures/combine-arguments/nested-match/output.js
@@ -1,4 +1,4 @@
 clsx(
-  color === 'primary' && [text && [classes.text, classes.textPrimary]],
+  color === 'primary' && text && [classes.text, classes.textPrimary],
   text && [classes.text, color === 'secondary' && classes.textSecondary],
 );