@putout/printer 3.2.0 → 3.4.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.08.10, v3.4.0
+
+feature:
+- d29fdfd (Arrow)FunctionExpression: parens
+
+2023.08.10, v3.3.0
+
+feature:
+- e1396e3 DoWhileStatement: indent, newline
+
 2023.08.10, v3.2.0
 
 feature:

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

@@ -7,16 +7,12 @@ function CallExpression(path, {indent, print, maybe, traverse}) {
     
     const callee = path.get('callee');
     const typeParameters = path.get('typeParameters');
-    const isFn = callee.isFunction();
     
-    maybe.write(isFn, '(');
     traverse(callee);
     
     if (exists(typeParameters))
         traverse(typeParameters);
     
-    maybe.write(isFn, ')');
-    
     if (path.node.optional)
         print('?.');
     

package/lib/tokenize/expressions/function/arrow-function-expression.js

@@ -4,8 +4,8 @@ const {exists} = require('../../is');
 const {printParams} = require('./params');
 
 module.exports.ArrowFunctionExpression = {
-    condition({parentPath}) {
-        return parentPath.isLogicalExpression();
+    condition(path) {
+        return path.node.extra?.parenthesized;
     },
     before(path, {write}) {
         write('(');
@@ -21,7 +21,6 @@ module.exports.ArrowFunctionExpression = {
         const {async} = path.node;
         
         print('__typeParameters');
-        
         maybe.print(async, 'async ');
         
         printParams(path, printer, semantics);

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

@@ -3,30 +3,41 @@
 const {exists} = require('../../is');
 const {printParams} = require('./params');
 
-module.exports.FunctionExpression = (path, printer, semantics) => {
-    const {
-        print,
-        maybe,
-        write,
-        traverse,
-    } = printer;
-    
-    const {node} = path;
-    const {generator, async} = node;
-    
-    maybe.write(async, 'async ');
-    write('function');
-    maybe.write(generator, '*');
-    
-    const id = path.get('id');
-    
-    if (exists(id)) {
-        write(' ');
-        traverse(id);
-    }
-    
-    printParams(path, printer, semantics);
-    
-    print.space();
-    print('__body');
+module.exports.FunctionExpression = {
+    condition(path) {
+        return path.node.extra?.parenthesized;
+    },
+    before(path, {write}) {
+        write('(');
+    },
+    print(path, printer, semantics) {
+        const {
+            print,
+            maybe,
+            write,
+            traverse,
+        } = printer;
+        
+        const {node} = path;
+        const {generator, async} = node;
+        
+        maybe.write(async, 'async ');
+        write('function');
+        maybe.write(generator, '*');
+        
+        const id = path.get('id');
+        
+        if (exists(id)) {
+            write(' ');
+            traverse(id);
+        }
+        
+        printParams(path, printer, semantics);
+        
+        print.space();
+        print('__body');
+    },
+    after(path, {write}) {
+        write(')');
+    },
 };

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

@@ -21,6 +21,13 @@ const isFirstStatement = (path) => path.node.body[0];
 const isFirstDirective = (path) => path.node.directives?.[0];
 const isMethodOrArrow = (path) => isArrowFunctionExpression(path) || isObjectMethod(path);
 
+const parentIfWithoutElse = ({parentPath}) => {
+    if (!parentPath.isIfStatement())
+        return false;
+    
+    return !parentPath.node.alternate;
+};
+
 module.exports.BlockStatement = {
     print(path, {indent, maybe, write, traverse}, semantics) {
         const body = path.get('body');
@@ -65,6 +72,9 @@ module.exports.BlockStatement = {
 function shouldAddNewlineAfter(path) {
     const {parentPath} = path;
     
+    if (parentPath.isDoWhileStatement())
+        return false;
+    
     if (parentPath.isBlockStatement())
         return true;
     
@@ -74,7 +84,7 @@ function shouldAddNewlineAfter(path) {
     if (insideIfWithNoBody(path))
         return false;
     
-    if (path.parentPath.isIfStatement() && path.find(isMethodOrArrow))
+    if (parentIfWithoutElse(path) && path.find(isMethodOrArrow))
         return true;
     
     if (parentPath.isStatement() && !path.node.body.length && !isNext(parentPath))

package/lib/tokenize/statements/do-while-statement.js

@@ -1,12 +1,22 @@
 'use strict';
 
-module.exports.DoWhileStatement = (path, {print}) => {
-    print('do');
-    print.space();
-    print('__body');
-    print.space();
-    print('while ');
-    print('(');
-    print('__test');
-    print(')');
+const {isLast} = require('../is');
+const notLast = (path) => !isLast(path);
+
+module.exports.DoWhileStatement = {
+    print(path, {print, indent}) {
+        indent();
+        print('do');
+        print.space();
+        print('__body');
+        print.space();
+        print('while ');
+        print('(');
+        print('__test');
+        print(')');
+    },
+    afterSatisfy: () => [notLast],
+    after(path, {print}) {
+        print.newline();
+    },
 };

package/package.json

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