@putout/printer 14.3.5 → 14.3.7

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.03.29, v14.3.7
+
+fix:
+- a73ce65 @putout/printer: ExpressionStatement: comments
+
+2025.03.28, v14.3.6
+
+fix:
+- 7dbb77e @putout/printer: ExpressionStatement: AssignmentExpression and then CallEpression
+
 2025.03.28, v14.3.5
 
 feature:

package/lib/tokenize/comment/parse-trailing-comments.js

@@ -13,6 +13,8 @@ const {isLooksLikeChain} = require('../expressions/member-expression/is-looks-li
 const {
     isDecorator,
     isMemberExpression,
+    isExpressionStatement,
+    isCallExpression,
 } = types;
 
 const hasBody = (path) => {
@@ -136,8 +138,23 @@ module.exports.parseTrailingComments = (path, {write, maybe, indent}, semantics)
         if (type === 'CommentBlock') {
             maybe.write.space(sameLine);
             maybe.indent(!sameLine);
+            maybe.print.breakline(isPrevCall(path));
             write(`/*${value}*/`);
             maybe.write.newline(!sameLine || !isFnParam(path) && isCoupleLines(path.parentPath));
         }
     }
 };
+
+function isPrevCall(path) {
+    const prev = path.getPrevSibling();
+    
+    if (isExpressionStatement(prev))
+        return false;
+    
+    const {expression} = path.node;
+    
+    if (!isCallExpression(expression))
+        return false;
+    
+    return !isCallExpression(expression.arguments[0]);
+}

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

@@ -15,10 +15,12 @@ const {
 } = require('../../is');
 
 const {isInsideAssignNextAssignFunction} = require('./is-inside-assign-next-assign-function');
+const isCommentBlock = (a) => a?.type === 'CommentBlock';
 
 const {
     isCallExpression,
     isExpressionStatement,
+    isAssignmentExpression,
 } = types;
 
 const not = (fn) => (...a) => !fn(...a);
@@ -78,8 +80,8 @@ module.exports.ExpressionStatement = {
             
             const condition = isNext(path)
                 && noTrailingComment(path)
-                || isNextCallWithLeadingComment(path)
-                || isNextIf(path);
+                || isNextToAssignmentCall(path)
+                || isNextStatementWithBlockComment(path);
             
             if (condition)
                 indent();
@@ -156,7 +158,10 @@ function isStrictMode(path) {
     return value === 'use strict';
 }
 
-function isNextCallWithLeadingComment(path) {
+function isNextToAssignmentCall(path) {
+    if (isAssignmentExpression(path.node.expression))
+        return false;
+    
     const nextPath = path.getNextSibling();
     
     if (!isExpressionStatement(nextPath))
@@ -166,3 +171,23 @@ function isNextCallWithLeadingComment(path) {
     
     return isCallExpression(expression);
 }
+
+function isNextStatementWithBlockComment(path) {
+    const {expression} = path.node;
+    
+    if (!isCallExpression(expression))
+        return false;
+    
+    if (!isCallExpression(expression.arguments[0]))
+        return false;
+    
+    return hasTrailingBlock(path);
+}
+
+function hasTrailingBlock(path) {
+    const {trailingComments} = path.node;
+    const [first] = trailingComments;
+    
+    return isCommentBlock(first);
+}
+

package/package.json

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