@putout/printer 12.18.0 → 12.19.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.01.28, v12.19.0
+
+feature:
+- 8d2c91a @putout/printer: MemberExpression: chain: comments: improve
+
 2025.01.27, v12.18.0
 
 feature:

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

@@ -8,6 +8,8 @@ const {
     isNext,
 } = require('../is');
 
+const {isLooksLikeChain} = require('../expressions/member-expression/is-looks-like-chain');
+
 const {
     isDecorator,
     isMemberExpression,
@@ -47,15 +49,12 @@ const isNewlineAfter = (path) => {
 module.exports.isTrailingIsLeading = isTrailingIsLeading;
 
 function isCommentOnNextLine(path) {
-    const {node, parentPath} = path;
+    const {node} = path;
     const {
         loc,
         trailingComments,
     } = node;
     
-    if (parentPath.isMemberExpression())
-        return false;
-    
     if (path.isClassMethod())
         return false;
     
@@ -84,7 +83,9 @@ function isCommentOnNextLine(path) {
     return isNextLine || isNextLineAfterNewline;
 }
 
-module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
+module.exports.parseTrailingComments = (path, {write, maybe, indent}, semantics) => {
+    const {parentPath} = path;
+    
     if (!semantics.comments)
         return;
     
@@ -97,15 +98,24 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
         return;
     
     const n = trailingComments.length - 1;
+    const likeChain = isLooksLikeChain(parentPath);
     
     for (const {type, value, loc} of trailingComments) {
         const sameLine = isSameLine(path, loc);
         const commentOnNextLine = isCommentOnNextLine(path);
         
         if (type === 'CommentLine') {
+            const nextLineInChain = commentOnNextLine && likeChain;
+            const shouldIndent = !sameLine && (!commentOnNextLine || path.isDecorator());
+            
             maybe.write.breakline(commentOnNextLine);
             maybe.write.space(sameLine);
-            maybe.indent(!sameLine && (!commentOnNextLine || path.isDecorator()));
+            
+            if (shouldIndent || nextLineInChain) {
+                maybe.indent.inc(nextLineInChain);
+                indent();
+                maybe.indent.dec(nextLineInChain);
+            }
             
             if (hasBody(path)) {
                 maybe.write.breakline(!isNext(path));

package/lib/tokenize/expressions/member-expression/chain.js

@@ -41,6 +41,11 @@ function up(current) {
     const properties = [];
     
     while (current.isMemberExpression()) {
+        if (current.node.object.trailingComments)
+            properties.push({
+                type: 'CommentLine',
+            });
+        
         current = current.parentPath;
         
         if (current.isCallExpression()) {

package/lib/tokenize/expressions/member-expression/is-looks-like-chain.js

@@ -10,10 +10,11 @@ const {
     isCallExpression,
 } = types;
 
-const isArgOfCall = (path) => path.parentPath.isCallExpression() && path.parentPath.get('arguments.0') === path;
+const isArgOfCall = (path) => path.parentPath?.isCallExpression() && path.parentPath.get('arguments.0') === path;
 const isCall = (a) => a.type === 'CallExpression';
 
 const isExcludedFromChain = satisfy([isUnaryExpression, isIfStatement]);
+const hasComment = ({type}) => type === 'CommentLine';
 
 module.exports.isLooksLikeChain = (path) => {
     const [root, properties] = chain(path);
@@ -24,6 +25,9 @@ module.exports.isLooksLikeChain = (path) => {
     if (properties.find(isPathGet))
         return false;
     
+    if (properties.find(hasComment))
+        return true;
+    
     if (path.find(isIfUp))
         return false;
     

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

@@ -16,6 +16,8 @@ module.exports.MemberExpression = (path, printer) => {
     const isParens = object.isAssignmentExpression();
     const {computed} = path.node;
     
+    const isChain = isLooksLikeChain(path);
+    
     maybe.print(isParens, '(');
     traverse(object);
     maybe.print(isParens, ')');
@@ -23,8 +25,6 @@ module.exports.MemberExpression = (path, printer) => {
     if (computed)
         return maybePrintComputed(path, property, printer);
     
-    const isChain = isLooksLikeChain(path);
-    
     maybe.indent.inc(isChain);
     maybe.print.breakline(isChain);
     

package/package.json

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