feat(removecalls): handle arrays

src/visitors/removeUnnecessaryCalls.js

@@ -66,7 +66,14 @@ const transforms = [
     if (args.length !== 1) return;
 
     const [arg] = args;
-    if (t.isLogicalExpression(arg, { operator: '&&' }) && isStringLike(arg.right)) {
+    if (
+      t.isLogicalExpression(arg, { operator: '&&' }) &&
+      (isStringLike(arg.right) ||
+        isSafeConditionalExpression(arg.right) ||
+        (t.isBinaryExpression(arg.right, { operator: '+' }) &&
+          isStringLike(arg.right.left) &&
+          isSafeConditionalExpression(arg.right.right)))
+    ) {
       return t.conditionalExpression(arg.left, arg.right, t.stringLiteral(''));
     } else if (t.isLogicalExpression(arg, { operator: '||' }) && isStringLike(arg.right)) {
       // Assume that arg.left returns a string value
@@ -96,13 +103,28 @@ const transforms = [
   },
 ];
 
+const arrayVisitor = {
+  ArrayExpression(path) {
+    for (const t of transforms) {
+      const result = t(path.node.elements);
+
+      if (result !== undefined) {
+        path.replaceWith(result);
+        break;
+      }
+    }
+  },
+};
+
 const visitor = {
   CallExpression(path) {
     const c = path.node.callee;
     if (!t.isIdentifier(c) || !this.options.functionNames.includes(c.name)) {
       return;
     }
 
+    path.traverse(arrayVisitor);
+
     for (const t of transforms) {
       const result = t(path.node.arguments);
 

test/fixtures/remove-unnecessary-calls/array/code.js

@@ -0,0 +1,2 @@
+const x1 = clsx(canDrop && ['on-drag-enter', isOver && 'on-drag-hover']);
+const x2 = clsx(canDrop && [!isOver && 'on-drag-enter', isOver && 'on-drag-hover']);

test/fixtures/remove-unnecessary-calls/array/output.js

@@ -0,0 +1,2 @@
+const x1 = canDrop ? 'on-drag-enter' + (isOver ? ' on-drag-hover' : '') : '';
+const x2 = canDrop ? (isOver ? 'on-drag-hover' : 'on-drag-enter') : '';