@putout/printer 12.10.0 → 12.12.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.24, v12.12.0
+
+feature:
+- 4a02949 @putout/printer: comments
+
+2025.01.23, v12.11.0
+
+feature:
+- f854725 @putout/printer: BlockStatement: is-call-inside-chain: ReturnStatement
+
 2025.01.23, v12.10.0
 
 feature:

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

@@ -17,6 +17,7 @@ const {
     isClassProperty,
     isTSPropertySignature,
     isSpreadElement,
+    isClassBody,
 } = types;
 
 const isProperty = satisfy([
@@ -70,10 +71,20 @@ function isCommentOnPreviousLine(path) {
     if (isCommentOfPrevious(path))
         return false;
     
-    return line === loc.start.line - 1;
+    return line <= loc.start.line - 1;
 }
 
-const isFirst = (path) => path === path.parentPath?.get('properties')[0];
+const isFirst = (path) => {
+    const {parentPath} = path;
+    
+    if (path === parentPath.get('properties')[0])
+        return true;
+    
+    if (isClassBody(parentPath) && isClassProperty(path))
+        return path === parentPath.get('body')[0];
+    
+    return false;
+};
 
 module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
     if (!semantics.comments)
@@ -101,10 +112,13 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
         && !insideFn
         && !propIs;
     
-    for (const {type, value} of leadingComments) {
-        maybe.indent(isIndent);
-        
+    const count = leadingComments.length - 1;
+    
+    for (const [index, {type, value}] of leadingComments.entries()) {
         if (type === 'CommentLine') {
+            if (!path.isClassProperty() || index)
+                maybe.indent(isIndent);
+            
             maybeInsideFn(insideFn, {
                 print,
                 indent,
@@ -117,8 +131,12 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
             
             print(`//${value}`);
             
-            maybe.print.breakline(propIs);
-            maybe.print.newline(!propIs);
+            if (index === count) {
+                maybe.print.breakline(propIs);
+                maybe.print.newline(!propIs);
+            } else {
+                print.newline();
+            }
             
             if (isInsideVar(path)) {
                 indent.inc();
@@ -130,6 +148,8 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
         }
         
         if (type === 'CommentBlock') {
+            maybe.indent(isIndent);
+            
             const looksLikeMethod = path.isClassMethod();
             const looksLikeDirective = path.isDirective();
             const looksLikeProp = path.isObjectProperty();

package/lib/tokenize/statements/block-statement/is-call-inside-chain.js

@@ -3,6 +3,7 @@
 const {types} = require('@putout/babel');
 const {isLooksLikeChain} = require('../../expressions/member-expression/is-looks-like-chain');
 const {
+    isReturnStatement,
     isExpressionStatement,
     isMemberExpression,
     isCallExpression,
@@ -38,5 +39,10 @@ function isTopCall(path) {
     if (!isCallExpression(path))
         return false;
     
-    return isExpressionStatement(path.parentPath);
+    const {parentPath} = path;
+    
+    if (isReturnStatement(parentPath))
+        return true;
+    
+    return isExpressionStatement(parentPath);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "12.10.0",
+  "version": "12.12.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -52,10 +52,16 @@
   ],
   "imports": {
     "#test/printer": {
-      "default": "./test/printer.js"
+      "default": "./test/print-extension/print-extension.js"
     },
     "#test/fixture": {
       "default": "./test/fixture.js"
+    },
+    "#printer": {
+      "default": "./lib/printer.js"
+    },
+    "#test": {
+      "default": "./test/create-test.js"
     }
   },
   "devDependencies": {