@putout/printer 12.25.0 → 12.27.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2025.02.08, v12.27.0
+
+feature:
+- 7775296 @putout/printer: Decorator: trailing comments
+
+2025.02.08, v12.26.0
+
+feature:
+- b2afc0d @putout/printer: @putout/compare v16.0.1
+- 386284a @putout/printer: ClassMethod: comments
+
 2025.02.07, v12.25.0
 
 feature:

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

@@ -19,6 +19,8 @@ const {
     isSpreadElement,
     isClassBody,
     isBinaryExpression,
+    isClassMethod,
+    isDecorator,
 } = types;
 
 const isProperty = satisfy([
@@ -41,13 +43,14 @@ const isInsideVar = (path) => {
     return isVariableDeclarator(parentPath.parentPath);
 };
 
-const hasDecorators = (path) => {
-    const {parentPath} = path;
+const hasDecoratorsWithComments = (path) => {
+    if (isDecorator(path))
+        return false;
     
-    if (path.node.decorators?.length)
+    if (path.node.decorators)
         return true;
     
-    return parentPath.node.decorators?.length;
+    return path?.parentPath.node?.decorators;
 };
 
 function isCommentOfPrevious(path) {
@@ -96,7 +99,7 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
     if (!leadingComments?.length)
         return;
     
-    if (hasDecorators(path))
+    if (hasDecoratorsWithComments(path))
         return;
     
     const looksLikeSwitchCase = path.isSwitchCase();
@@ -136,7 +139,9 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
                 maybe.print.breakline(propIs);
                 maybe.print.newline(!propIs);
                 
-                if (isBinaryExpression(path)) {
+                if (isClassMethod(path)) {
+                    indent();
+                } else if (isBinaryExpression(path) || isDecorator(path)) {
                     indent.inc();
                     indent();
                     indent.dec();

package/lib/tokenize/expressions/function/params.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {parseComments} = require('../../comment/comment');
+
 const noop = () => {};
 const parseParams = (path) => path.get('params');
 

package/lib/tokenize/expressions/function/print-function-params.js

@@ -1,6 +1,19 @@
 'use strict';
 
 const {printParams} = require('./params');
+const {hasLeadingComment} = require('../../is');
+
+const isDecoratorHasLeadingComment = (path) => {
+    const [firstParam] = path.get('params');
+    const decorators = firstParam.get('decorators');
+    
+    if (!decorators.length)
+        return false;
+    
+    const [firstDecorator] = decorators;
+    
+    return hasLeadingComment(firstDecorator);
+};
 
 const hasDecorators = ({decorators}) => decorators?.length;
 
@@ -10,13 +23,13 @@ module.exports.printFunctionParams = (path, printer, semantics) => {
     const isNewline = params.filter(hasDecorators).length;
     const printSpace = isNewline ? print.breakline : print.space;
     
-    const printBeforeFirst = createPrint({
+    const printBeforeFirst = createPrint(path, {
         type: 'inc',
         printer,
         isNewline,
     });
     
-    const printAfterLast = createPrint({
+    const printAfterLast = createPrint(path, {
         type: 'dec',
         printer,
         isNewline,
@@ -29,11 +42,14 @@ module.exports.printFunctionParams = (path, printer, semantics) => {
     });
 };
 
-const createPrint = ({isNewline, printer, type}) => () => {
+const createPrint = (path, {isNewline, printer, type}) => () => {
     if (!isNewline)
         return;
     
     const {indent, print} = printer;
-    indent[type]();
+    
+    if (!isDecoratorHasLeadingComment(path))
+        indent[type]();
+    
     print.breakline();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "12.25.0",
+  "version": "12.27.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@putout/babel": "^3.0.0",
-    "@putout/compare": "^15.0.2",
+    "@putout/compare": "^16.0.1",
     "@putout/operate": "^12.0.0",
     "@putout/operator-json": "^2.0.0",
     "fullstore": "^3.0.0",