feature: @putout/plugin-minify: convert-if-to-logical: nested-or: (co…

…deraiser/minify#12)
coderaiser · Jun 5, 2024 · 12b63fd · 12b63fd
1 parent 492d1b5
commit 12b63fd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/packages/plugin-minify/lib/convert-if-to-logical/fixture/nested-or-fix.js b/packages/plugin-minify/lib/convert-if-to-logical/fixture/nested-or-fix.js
@@ -0,0 +1 @@
+(var1 || (var2 && var3)) && (fn1(), var4 && fn2());
diff --git a/packages/plugin-minify/lib/convert-if-to-logical/fixture/nested-or.js b/packages/plugin-minify/lib/convert-if-to-logical/fixture/nested-or.js
@@ -0,0 +1,6 @@
+if (var1 || (var2 && var3)) {
+   fn1();
+   if (var4) {
+       fn2();
+   }
+}
diff --git a/packages/plugin-minify/lib/convert-if-to-logical/index.js b/packages/plugin-minify/lib/convert-if-to-logical/index.js
@@ -78,7 +78,7 @@ export const replace = () => ({
 
         const expressions = parseExpressions(__b);
 
-        return LogicalExpression('&&', __a, SequenceExpression(expressions));
+        return LogicalExpression('&&', maybeAddParens(__a), SequenceExpression(expressions));
     },
     'if (__a) __b; else __c': ({__a, __b, __c}) => {
         if (!__b.body.length && isBlockStatement(__c))
@@ -100,9 +100,11 @@ export const replace = () => ({
 
 function maybeAddParens(node) {
     if (!isLogicalExpression(node))
-        return;
+        return node;
 
     node.extra = {
         parenthesized: true,
     };
+
+    return node;
 }
diff --git a/packages/plugin-minify/lib/convert-if-to-logical/index.spec.js b/packages/plugin-minify/lib/convert-if-to-logical/index.spec.js
@@ -47,3 +47,8 @@ test('plugin-minify: convert-if-to-logical: transform: or', (t) => {
     t.transform('or');
     t.end();
 });
+
+test('plugin-minify: convert-if-to-logical: transform: nested-or', (t) => {
+    t.transform('nested-or');
+    t.end();
+});