@putout/printer 16.0.0 → 16.2.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2025.12.09, v16.2.0
+
+feature:
+- e0a7a89 @putout/printer: TSPropertySignature: comments: improve support
+
+2025.12.08, v16.1.0
+
+feature:
+- 1974703 @putout/printer: ClassDeclaration: implements: improve support
+- f8a62fa @putout/printer: TSInterfaceDeclaration: improve support of extends
+- 0a62781 @putout/printer: escover v5.0.0
+- ca1d748 @putout/printer: putout v41.0.0
+
 2025.11.28, v16.0.0
 
 feature:

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

@@ -4,7 +4,6 @@ const {types} = require('@putout/babel');
 const {
     hasTrailingComment,
     satisfy,
-    isPrev,
 } = require('../is');
 
 const {markBefore} = require('../mark');
@@ -179,9 +178,6 @@ module.exports.parseLeadingComments = (path, printer, semantics, {currentTravers
             
             print(`/*${value}*/`);
             
-            if (isTSPropertySignature(path) && !isPrev(path))
-                print.breakline();
-            
             if (path.isStatement() || path.isTSEnumMember() || looksLikeDirective || looksLikeMethod || looksLikeProp || looksLikeSwitchCase) {
                 print.newline();
                 markBefore(path);

package/lib/tokenize/expressions/class/class.js

@@ -52,8 +52,20 @@ const classVisitor = maybeDecorators((path, printer, semantics) => {
     }
     
     if (node.implements) {
-        print(' implements ');
-        path.get('implements').forEach(print);
+        const {typeParameters} = node;
+        
+        if (!typeParameters || typeParameters.params.length < 2)
+            print(' ');
+        
+        print('implements ');
+        
+        const implementsPaths = path.get('implements');
+        const n = implementsPaths.length - 1;
+        
+        for (const [i, implement] of implementsPaths.entries()) {
+            print(implement);
+            maybe.print(i < n, ', ');
+        }
     }
     
     print.space();

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

@@ -20,6 +20,7 @@ module.exports.printParams = (path, printer, semantics, customization = {}) => {
         printSpace = print.space,
         printAfterOpen = noop,
         printBeforeClose = noop,
+        printAfterClose = noop,
     } = customization;
     
     if (typeParameters)
@@ -54,6 +55,7 @@ module.exports.printParams = (path, printer, semantics, customization = {}) => {
         print,
         braceClose,
     }, semantics);
+    printAfterClose();
 };
 
 function printBraceOpen(path, {print, braceOpen}, semantics) {

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

@@ -89,3 +89,5 @@ const createPrintSpace = ({isNewline, printer}) => () => {
     
     print.breakline();
 };
+
+module.exports.createPrintSpace = createPrintSpace;

package/lib/tokenize/typescript/index.js

@@ -37,6 +37,7 @@ const {TSExportAssignment} = require('./ts-export-assignment/ts-export-assignmen
 const {TSTypeReference} = require('./ts-type-reference/ts-type-reference');
 const {TSInferType} = require('./ts-infer-type/ts-infer-type');
 const {TSParameterProperty} = require('./ts-parameter-property/ts-parameter-property');
+const {TSTypeParameterDeclaration} = require('./ts-type-parameter-declaration/ts-type-parameter-declaration');
 const {TSTypeQuery} = require('./ts-type-query/ts-type-query');
 const {TSParenthesizedType} = require('./ts-parenthesized-type/ts-parenthesized-type');
 const {TSTemplateLiteralType} = require('./ts-template-literal-type/ts-template-literal-type');
@@ -59,6 +60,7 @@ module.exports = {
     TSTypeQuery,
     TSTemplateLiteralType,
     TSOptionalType,
+    TSTypeParameterDeclaration,
     TSBigIntKeyword(path, {write}) {
         write('bigint');
     },
@@ -86,12 +88,6 @@ module.exports = {
         print('...');
         print('__typeAnnotation');
     },
-    TSTypeParameterDeclaration(path, printer, semantics) {
-        printParams(path, printer, semantics, {
-            braceOpen: '<',
-            braceClose: '>',
-        });
-    },
     TSTypeParameterInstantiation(path, printer, semantics) {
         printParams(path, printer, semantics, {
             braceOpen: '<',

package/lib/tokenize/typescript/interface/ts-interface-body.js

@@ -13,22 +13,38 @@ module.exports.TSInterfaceBody = (path, printer, semantics) => {
     
     write.space();
     write('{');
-    maybe.write.newline(body.length);
+    
+    maybe.write.newline(hasNoLeadingComments(path));
     indent.inc();
     
     parseComments(path, printer, semantics);
     
-    for (const item of body) {
-        indent();
+    for (const [index, item] of body.entries()) {
+        if (index || !item.node.leadingComments)
+            indent();
+        
         traverse(item);
     }
     
     indent.dec();
     indent();
+    
     write('}');
     maybe.write.newline(findTSModuleBlock(path));
 };
 
+function hasNoLeadingComments(path) {
+    const {body} = path.node;
+    
+    if (!body.length)
+        return false;
+    
+    const [first] = body;
+    const {leadingComments} = first;
+    
+    return !leadingComments;
+}
+
 function findTSModuleBlock(path) {
     if (path.parentPath.parentPath.isTSModuleBlock())
         return true;

package/lib/tokenize/typescript/interface/ts-interface-declaration.js

@@ -17,13 +17,19 @@ const isInsideNamespace = (path) => isTSModuleBlock(path.parentPath.parentPath);
 module.exports.TSInterfaceDeclaration = {
     print: maybeDeclare((path, {print, maybe}) => {
         const {node} = path;
+        const {typeParameters} = node;
         
         maybe.indent(!isExportNamedDeclaration(path.parentPath));
         print('interface ');
         print('__id');
         
+        print('__typeParameters');
+        
         if (node.extends) {
-            print(' extends ');
+            if (!typeParameters || typeParameters.length < 2)
+                print(' ');
+            
+            print('extends ');
             
             const extendsPaths = path.get('extends');
             const n = extendsPaths.length - 1;
@@ -34,7 +40,6 @@ module.exports.TSInterfaceDeclaration = {
             }
         }
         
-        print('__typeParameters');
         print('__body');
     }),
     afterSatisfy: () => [isNext, isNextParent],

package/lib/tokenize/typescript/ts-property-signature/comments.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const {isPrev} = require('#is');
+const noop = () => {};
+
+module.exports.printLeadingCommentLine = (path, printer, semantics, {printComment}) => {
+    const {print} = printer;
+    print.breakline();
+    printComment();
+    print.breakline();
+};
+
+module.exports.printLeadingCommentBlock = (path, printer, semantics, {printComment}) => {
+    const {print, maybe} = printer;
+    
+    maybe.print.breakline(!isPrev(path));
+    printComment();
+    print.indent();
+};
+
+module.exports.printTrailingCommentBlock = noop;

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

@@ -9,9 +9,14 @@ const {
 
 const {printKey} = require('../../expressions/object-expression/print-key');
 
+const {
+    printLeadingCommentLine,
+    printLeadingCommentBlock,
+    printTrailingCommentBlock,
+} = require('./comments');
+
 module.exports.TSPropertySignature = (path, printer) => {
     const {maybe, write} = printer;
-    
     const {optional, readonly} = path.node;
     
     maybe.print(readonly, 'readonly ');
@@ -28,6 +33,9 @@ module.exports.TSPropertySignature = (path, printer) => {
     if (isNext(path) && hasTrailingComment(path))
         write.newline();
 };
+module.exports.TSPropertySignature.printLeadingCommentLine = printLeadingCommentLine;
+module.exports.TSPropertySignature.printLeadingCommentBlock = printLeadingCommentBlock;
+module.exports.TSPropertySignature.printTrailingCommentBlock = printTrailingCommentBlock;
 
 function isTSTypeLiteralWithOneMember({parentPath}) {
     if (!parentPath.parentPath.isTSTypeParameterInstantiation())

package/lib/tokenize/typescript/ts-type-parameter-declaration/ts-type-parameter-declaration.js

@@ -0,0 +1,50 @@
+'use strict';
+
+const {types} = require('@putout/babel');
+const {createPrintSpace} = require('../../expressions/function/print-function-params');
+const {printParams} = require('../../expressions/function/params');
+const {isTSUnionType} = types;
+const noop = () => {};
+
+module.exports.TSTypeParameterDeclaration = (path, printer, semantics) => {
+    const {print, indent} = printer;
+    const isNewline = hasComplexParameters(path);
+    const printSpace = createPrintSpace({
+        isNewline,
+        printer,
+    });
+    
+    const printAfterOpen = !isNewline ? noop : () => {
+        indent.inc();
+        print.breakline();
+    };
+    
+    const printAfterClose = !isNewline ? noop : () => {
+        print.breakline();
+    };
+    
+    const printBeforeClose = !isNewline ? noop : () => {
+        indent.dec();
+        print.breakline();
+    };
+    
+    printParams(path, printer, semantics, {
+        printSpace,
+        braceOpen: '<',
+        braceClose: '>',
+        printAfterOpen,
+        printBeforeClose,
+        printAfterClose,
+    });
+};
+
+function hasComplexParameters({node}) {
+    const {params} = node;
+    
+    for (const {constraint} of params) {
+        if (isTSUnionType(constraint))
+            return true;
+    }
+    
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "16.0.0",
+  "version": "16.2.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -79,17 +79,16 @@
     "acorn": "^8.8.2",
     "c8": "^10.1.2",
     "check-dts": "^0.9.0",
-    "escover": "^4.0.1",
+    "escover": "^5.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-putout": "^29.0.0",
     "estree-to-babel": "^11.0.2",
     "goldstein": "^6.0.1",
     "just-kebab-case": "^4.2.0",
     "madrun": "^11.0.0",
-    "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^3.0.1",
-    "putout": "^40.0.1",
+    "putout": "^41.0.0",
     "redlint": "^4.0.0",
     "samadhi": "^3.0.3",
     "supertape": "^11.1.0",