@putout/printer 12.26.0 → 12.27.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.02.08, v12.27.1
+
+feature:
+- bd1a8cd @putout/printer: decorators: comments: improve
+
+2025.02.08, v12.27.0
+
+feature:
+- 7775296 @putout/printer: Decorator: trailing comments
+
 2025.02.08, v12.26.0
 
 feature:

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

@@ -20,6 +20,7 @@ const {
     isClassBody,
     isBinaryExpression,
     isClassMethod,
+    isDecorator,
 } = types;
 
 const isProperty = satisfy([
@@ -42,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) {
@@ -97,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();
@@ -139,7 +141,7 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
                 
                 if (isClassMethod(path)) {
                     indent();
-                } else if (isBinaryExpression(path)) {
+                } 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');
 
@@ -36,8 +37,9 @@ module.exports.printParams = (path, printer, semantics, customization = {}) => {
     
     for (let i = 0; i <= n; i++) {
         const isLast = i === n;
+        const current = params[i];
         
-        traverse(params[i]);
+        traverse(current);
         
         if (!isLast) {
             print(',');

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

@@ -1,25 +1,53 @@
 'use strict';
 
 const {printParams} = require('./params');
+const {hasLeadingComment} = require('../../is');
+
+const isAllParamsHasLeadingComments = (path) => {
+    const params = path.get('params');
+    let commentsCount = 0;
+    let decoratorsCount = 0;
+    
+    for (const param of params) {
+        const decorators = param.get('decorators');
+        
+        if (!decorators.length)
+            continue;
+        
+        const [firstDecorator] = decorators;
+        ++decoratorsCount;
+        
+        if (hasLeadingComment(firstDecorator))
+            ++commentsCount;
+    }
+    
+    return commentsCount === decoratorsCount;
+};
 
 const hasDecorators = ({decorators}) => decorators?.length;
 
 module.exports.printFunctionParams = (path, printer, semantics) => {
-    const {print} = printer;
     const {params} = path.node;
     const isNewline = params.filter(hasDecorators).length;
-    const printSpace = isNewline ? print.breakline : print.space;
+    const isAllHasComments = isAllParamsHasLeadingComments(path);
     
-    const printBeforeFirst = createPrint({
+    const printSpace = createPrintSpace({
+        isNewline,
+        printer,
+    });
+    
+    const printBeforeFirst = createPrintBeforeFirst(path, {
         type: 'inc',
         printer,
         isNewline,
+        isAllHasComments,
     });
     
-    const printAfterLast = createPrint({
+    const printAfterLast = createPrintAfterLast({
         type: 'dec',
         printer,
         isNewline,
+        isAllHasComments,
     });
     
     printParams(path, printer, semantics, {
@@ -29,11 +57,40 @@ module.exports.printFunctionParams = (path, printer, semantics) => {
     });
 };
 
-const createPrint = ({isNewline, printer, type}) => () => {
+const createPrintBeforeFirst = (path, {isNewline, isAllHasComments, printer, type}) => () => {
     if (!isNewline)
         return;
     
     const {indent, print} = printer;
-    indent[type]();
+    
+    if (!isAllHasComments)
+        indent[type]();
+    
+    print.breakline();
+    
+    const [first] = path.get('params');
+    
+    if (!first.node.decorators)
+        indent();
+};
+
+const createPrintAfterLast = ({isNewline, printer, isAllHasComments, type}) => () => {
+    if (!isNewline)
+        return;
+    
+    const {indent, print} = printer;
+    
+    if (!isAllHasComments)
+        indent[type]();
+    
+    print.breakline();
+};
+
+const createPrintSpace = ({isNewline, printer}) => () => {
+    const {print} = printer;
+    
+    if (!isNewline)
+        return print.space();
+    
     print.breakline();
 };

package/lib/tokenize/typescript/ts-parameter-property/ts-parameter-property.js

@@ -40,6 +40,5 @@ module.exports.TSParameterProperty = (path, {print, maybe, indent}) => {
     }
     
     print('__parameter');
-    maybe.print(isNewline, ',');
     maybe.print.breakline(decoratorsLength);
 };

package/package.json

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