@putout/printer 1.98.3 → 1.100.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.17, v1.100.0
+
+feature:
+- 1b2c36b @putout/printer: IfStatement: improve newline support when nested
+
+2023.05.16, v1.99.0
+
+feature:
+- a7f4de3 @putout/printer: BinaryExpression: parens (coderaiser/putout#146)
+
 2023.05.15, v1.98.3
 
 feature:

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

@@ -2,26 +2,25 @@
 
 const BinaryExpression = {
     condition(path) {
+        const parens = path.node.extra?.parenthesized;
+        
+        if (parens)
+            return true;
+        
         return path.parentPath.isAwaitExpression();
     },
     before(path, {print}) {
         print('(');
     },
-    print(path, {write, traverse, maybe}) {
+    print(path, {write, traverse}) {
         const left = path.get('left');
         const right = path.get('right');
-        const isLeft = isLogical(path, left);
-        const isRight = isLogical(path, right);
         
-        maybe.write(isLeft, '(');
         traverse(left);
-        maybe.write(isLeft, ')');
         write.space();
         write(path.node.operator);
         write.space();
-        maybe.write(isRight, '(');
         traverse(right);
-        maybe.write(isRight, ')');
     },
     after(path, {print}) {
         print(')');
@@ -30,12 +29,3 @@ const BinaryExpression = {
 
 module.exports.BinaryExpression = BinaryExpression;
 module.exports.LogicalExpression = BinaryExpression;
-
-const isLogical = (main, path) => {
-    const is = path.isLogicalExpression();
-    
-    if (!is)
-        return false;
-    
-    return main.node.operator !== path.node.operator;
-};

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

@@ -46,14 +46,10 @@ function unaryExpression(path, {maybe, traverse}) {
     } = path.node;
     
     const argPath = path.get('argument');
-    const round = argPath.isBinaryExpression() || argPath.isLogicalExpression();
     
     maybe.print(prefix, operator);
     maybe.print(isWord(operator), ' ');
     
-    maybe.print(round, '(');
     traverse(argPath);
-    maybe.print(round, ')');
-    
     maybe.print(!prefix, operator);
 }

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

@@ -5,6 +5,9 @@ const {exists} = require('../is');
 
 const isEmptyConsequent = (path) => path.get('consequent').isEmptyStatement();
 
+const isInsideIf = (path) => path.parentPath.parentPath?.isIfStatement();
+const isEmptyBody = (path) => !path.node.body.length;
+
 module.exports.IfStatement = {
     print: (path, {indent, print, maybe, write, traverse}) => {
         indent();
@@ -21,6 +24,7 @@ module.exports.IfStatement = {
         if (isConsequentBlock) {
             print.space();
             print(consequent);
+            maybe.print.newline(isEmptyBody(consequent) && isInsideIf(path));
         } else {
             const is = !isEmptyConsequent(path);
             maybe.print.newline(is);
@@ -49,7 +53,7 @@ module.exports.IfStatement = {
     afterIf: (path) => {
         const next = path.getNextSibling();
         
-        if (!next.node)
+        if (!exists(next))
             return false;
         
         if (next.isReturnStatement())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.98.3",
+  "version": "1.100.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",