@putout/printer 12.24.0 → 12.25.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.02.07, v12.25.0
+
+feature:
+- ab68c19 @putout/printer: improve decorators support
+
 2025.02.07, v12.24.0
 
 fix:

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

@@ -40,10 +40,15 @@ const isTrailingIsLeading = (path) => path.node.trailingComments === path.getNex
 const isNewlineAfter = (path) => {
     const {parentPath} = path;
     
+    if (isDecorator(path)) {
+        const {loc} = path.node.trailingComments[0];
+        return !isSameLine(path, loc);
+    }
+    
     if (isMemberExpression(parentPath))
         return false;
     
-    return !isLast(path) && !isDecorator(path);
+    return !isLast(path);
 };
 
 module.exports.isTrailingIsLeading = isTrailingIsLeading;
@@ -106,7 +111,7 @@ module.exports.parseTrailingComments = (path, {write, maybe, indent}, semantics)
         
         if (type === 'CommentLine') {
             const nextLineInChain = commentOnNextLine && likeChain;
-            const shouldIndent = !sameLine && (!commentOnNextLine || path.isDecorator());
+            const shouldIndent = !sameLine && !commentOnNextLine;
             
             maybe.write.breakline(commentOnNextLine);
             maybe.write.space(sameLine);

package/lib/tokenize/expressions/function/class-method.js

@@ -5,10 +5,10 @@ const {
     hasTrailingComment,
 } = require('../../is');
 
-const {printParams} = require('./params');
 const {maybeDecorators} = require('../../maybe/maybe-decorators');
 const {printKey} = require('../object-expression/print-key');
 const {printKind} = require('./kind');
+const {printFunctionParams} = require('./print-function-params');
 
 const noTrailingCommentAndNext = (path) => {
     if (hasTrailingComment(path))
@@ -45,7 +45,7 @@ const ClassMethod = {
         
         printKind(path, printer);
         printKey(path, printer);
-        printParams(path, printer, semantics);
+        printFunctionParams(path, printer, semantics);
         
         if (returnType) {
             print(':');

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

@@ -1,23 +1,26 @@
 'use strict';
 
 const {parseComments} = require('../../comment/comment');
-
+const noop = () => {};
 const parseParams = (path) => path.get('params');
 
 module.exports.printParams = (path, printer, semantics, customization = {}) => {
     const {extra, typeParameters} = path.node;
-    const {
-        params = parseParams(path),
-        braceOpen = '(',
-        braceClose = ')',
-    } = customization;
-    
     const {
         print,
         maybe,
         traverse,
     } = printer;
     
+    const {
+        params = parseParams(path),
+        braceOpen = '(',
+        braceClose = ')',
+        printSpace = print.space,
+        printBeforeFirst = noop,
+        printAfterLast = noop,
+    } = customization;
+    
     if (typeParameters)
         traverse(path.get('typeParameters'));
     
@@ -27,6 +30,7 @@ module.exports.printParams = (path, printer, semantics, customization = {}) => {
     }, semantics);
     
     parseComments(path, printer, semantics);
+    printBeforeFirst();
     
     const n = params.length - 1;
     
@@ -37,12 +41,13 @@ module.exports.printParams = (path, printer, semantics, customization = {}) => {
         
         if (!isLast) {
             print(',');
-            print.space();
+            printSpace();
         }
     }
     
     maybe.print(extra?.trailingComma, ',');
     
+    printAfterLast();
     printBraceClose(path, {
         print,
         braceClose,

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

@@ -0,0 +1,39 @@
+'use strict';
+
+const {printParams} = require('./params');
+
+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 printBeforeFirst = createPrint({
+        type: 'inc',
+        printer,
+        isNewline,
+    });
+    
+    const printAfterLast = createPrint({
+        type: 'dec',
+        printer,
+        isNewline,
+    });
+    
+    printParams(path, printer, semantics, {
+        printBeforeFirst,
+        printSpace,
+        printAfterLast,
+    });
+};
+
+const createPrint = ({isNewline, printer, type}) => () => {
+    if (!isNewline)
+        return;
+    
+    const {indent, print} = printer;
+    indent[type]();
+    print.breakline();
+};

package/lib/tokenize/literals/index.js

@@ -3,7 +3,7 @@
 const {TemplateLiteral} = require('./template-literal');
 const {Identifier} = require('./identifier');
 
-const {Decorator} = require('../expressions/decorator');
+const {Decorator} = require('../expressions/decorator/decorator');
 const {StringLiteral} = require('./string-literal');
 
 module.exports = {

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

@@ -1,24 +1,33 @@
 'use strict';
 
-module.exports.TSParameterProperty = (path, {print, maybe}) => {
+const {hasLeadingComment} = require('../../is');
+
+module.exports.TSParameterProperty = (path, {print, maybe, indent}) => {
     const {
         decorators,
         readonly,
         accessibility,
     } = path.node;
     
-    const decoratorsLength = decorators?.length;
+    const decoratorsLength = decorators?.length > 1;
+    const isNewline = decoratorsLength || hasLeadingComment(path);
     
     maybe.print.breakline(decoratorsLength);
     
-    if (decorators)
+    if (decorators) {
         for (const decorator of path.get('decorators')) {
-            print.indent();
+            maybe.indent(decoratorsLength);
             print(decorator);
         }
-    
-    maybe.print.breakline(decoratorsLength);
-    maybe.indent(decoratorsLength);
+        
+        maybe.print.breakline(decoratorsLength);
+        
+        if (isNewline)
+            indent();
+        
+        if (!hasLeadingComment(path))
+            print.space();
+    }
     
     if (accessibility) {
         print(accessibility);
@@ -31,6 +40,6 @@ module.exports.TSParameterProperty = (path, {print, maybe}) => {
     }
     
     print('__parameter');
-    maybe.print(decoratorsLength, ',');
+    maybe.print(isNewline, ',');
     maybe.print.breakline(decoratorsLength);
 };

package/package.json

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