@putout/printer 1.16.2 → 1.17.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2023.04.01, v1.17.0
+
+feature:
+- 1378835 @putout/printer: improve support of round brackets around LogicalExpressions
+- 3fc47f2 @putout/printer: improve support of BinaryExpression inside UnaryExpression
+
 2023.04.01, v1.16.2
 
 feature:

package/lib/tokenize/expressions/binary-expression.js

@@ -3,13 +3,20 @@
 module.exports.BinaryExpression = BinaryExpression;
 module.exports.LogicalExpression = BinaryExpression;
 
-const isLogical = (path) => path.isLogicalExpression();
+const isLogical = (main, path) => {
+    const is = path.isLogicalExpression();
+    
+    if (!is)
+        return false;
+    
+    return main.node.operator !== path.node.operator;
+};
 
 function BinaryExpression(path, {write, traverse, maybe}) {
     const left = path.get('left');
     const right = path.get('right');
-    const isLeft = isLogical(left);
-    const isRight = isLogical(right);
+    const isLeft = isLogical(path, left);
+    const isRight = isLogical(path, right);
     
     maybe.write(isLeft, '(');
     traverse(left);

package/lib/tokenize/expressions/unary-expressions.js

@@ -32,21 +32,21 @@ function printUnary(path, name, {print}) {
 }
 const isWord = (a) => /delete|typeof/.test(a);
 
-function unaryExpression(path, {print, maybe}) {
+function unaryExpression(path, {maybe, traverse}) {
     const {
         prefix,
         operator,
     } = path.node;
     
-    if (prefix)
-        print(operator);
+    const argPath = path.get('argument');
+    const round = argPath.isBinaryExpression();
     
-    maybe.print(isWord(
-        operator,
-    ), ' ');
+    maybe.print(prefix, operator);
     
-    print('__argument');
+    maybe.print(isWord(operator), ' ');
     
-    if (!prefix)
-        print(operator);
+    maybe.print(round, '(');
+    traverse(argPath);
+    maybe.print(round, ')');
+    maybe.print(!prefix, operator);
 }

package/lib/tokenize/is.js

@@ -15,7 +15,7 @@ const isNext = (path) => {
 const isNextParent = (path) => isNext(path.parentPath);
 const isLast = (path) => isParentProgram(path) && !isNext(path);
 
-module.exports.isFirst = (path) => path.node === path.parentPath.node.body[0];
+module.exports.isFirst = (path) => path.node === path.parentPath.node.body?.[0];
 module.exports.isPrevBody = (path) => path.getPrevSibling().isBlockStatement();
 module.exports.isNext = isNext;
 module.exports.isNextParent = isNextParent;

package/lib/tokenize/statements/if-statement.js

@@ -59,5 +59,8 @@ module.exports.IfStatement = {
 };
 
 function shouldAddNewlineBefore(path) {
+    if (path.parentPath.isIfStatement())
+        return false;
+    
     return !isFirst(path) && !hasPrevNewline(path);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.16.2",
+  "version": "1.17.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",