@putout/printer 1.14.3 → 1.15.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2023.03.31, v1.15.0
+
+feature:
+- 67b6b53 @putout/printer: add support of nested Binary and Logical Expressions
+- 6bcba84 @putout/printer: improve support of last ExpressionStatement inside of BlockStatement
+
 2023.03.30, v1.14.3
 
 feature:

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

@@ -3,10 +3,24 @@
 module.exports.BinaryExpression = BinaryExpression;
 module.exports.LogicalExpression = BinaryExpression;
 
-function BinaryExpression(path, {print}) {
-    print('__left');
-    print.space();
-    print(path.node.operator);
-    print.space();
-    print('__right');
+const isLogical = (path) => path.isLogicalExpression();
+
+function BinaryExpression(path, {write, traverse, maybe}) {
+    const left = path.get('left');
+    const right = path.get('right');
+    const isLeft = isLogical(left);
+    const isRight = isLogical(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, ')');
 }
+

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

@@ -63,7 +63,7 @@ function shouldBreakline(path) {
 }
 
 function shouldAddNewLineAfter(path) {
-    if (isLast(path) || isParentLast(path))
+    if (!isParentBlock(path) && (isLast(path) || isParentLast(path)))
         return false;
     
     if (isParentBlock(path) && !isParentProgram(path))

package/lib/tokenize/tokenize.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const {round} = Math;
+
 const fullstore = require('fullstore');
 const isObject = (a) => a && typeof a === 'object';
 const babelTraverse = require('@babel/traverse').default;
@@ -76,6 +78,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
     const maybeNewline = (a) => a && newline();
     const maybeBreakline = (a) => a && breakline();
     const maybeLinebreak = (a) => a && linebreak();
+    const maybeWrite = (a, b) => a && write(b);
     let i = 0;
     const incIndent = () => ++i;
     const decIndent = () => --i;
@@ -125,12 +128,14 @@ module.exports.tokenize = (ast, overrides = {}) => {
         newline,
         linebreak,
         breakline,
+        space,
     });
     
     const maybe = {
         indent: maybeIndent,
         markBefore: maybeMarkBefore,
         markAfter: maybeMarkAfter,
+        write: maybeWrite,
     };
     
     assign(maybe.indent, {
@@ -173,6 +178,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
         
         assign(print, write, {
             space,
+            round,
         });
         
         assign(printer, {
@@ -217,14 +223,23 @@ const createPrint = (path, {traverse, write}) => (maybeLine) => {
     if (maybeLine === path)
         return null;
     
+    const computed = computePath(path, maybeLine);
+    
+    if (isObject(computed))
+        return traverse(computed);
+    
+    return write(computed);
+};
+const computePath = (path, maybeLine) => {
     if (isString(maybeLine) && maybeLine.startsWith(GET))
-        return traverse(get(
+        return get(
             path,
             maybeLine,
-        ));
+        );
     
     if (isObject(maybeLine))
-        return traverse(maybeLine);
+        return maybeLine;
     
-    return write(maybeLine);
+    return maybeLine;
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.14.3",
+  "version": "1.15.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",