@putout/printer 16.1.0 → 16.3.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2025.12.09, v16.3.0
+
+feature:
+- 5c8c2ff @putout/printer: TSTypeLiteral: indent
+- 6419576 @putout/printer: TSImportType: trailing comma
+
+2025.12.09, v16.2.0
+
+feature:
+- e0a7a89 @putout/printer: TSPropertySignature: comments: improve support
+
 2025.12.08, v16.1.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/object-expression/object-property.js

@@ -1,11 +1,8 @@
 'use strict';
 
-const {types} = require('@putout/babel');
 const {isConcatenation} = require('../binary-expression/concatenate');
 const {isOneLine} = require('./object-expression');
 const {printKey} = require('./print-key');
-const {isTSImportType} = types;
-const isInsideTSImportType = ({parentPath}) => isTSImportType(parentPath.parentPath);
 
 module.exports.ObjectProperty = (path, printer, semantics) => {
     const {trailingComma} = semantics;
@@ -29,7 +26,7 @@ module.exports.ObjectProperty = (path, printer, semantics) => {
         traverse(value);
     }
     
-    if (manyLines && !isInsideTSImportType(path))
+    if (manyLines)
         maybe.write(!isLast || trailingComma, ',');
     else if (!isLast && properties.length)
         write(', ');

package/lib/tokenize/typescript/index.js

@@ -32,7 +32,7 @@ const {TSMethodSignature} = require('./function/ts-method-signature');
 const {TSUnionType} = require('./ts-union-type/ts-union-type');
 
 const {maybePrintTypeAnnotation} = require('../maybe/maybe-type-annotation');
-const {TSImportType} = require('./ts-import-type');
+const {TSImportType} = require('./ts-import-type/ts-import-type');
 const {TSExportAssignment} = require('./ts-export-assignment/ts-export-assignment');
 const {TSTypeReference} = require('./ts-type-reference/ts-type-reference');
 const {TSInferType} = require('./ts-infer-type/ts-infer-type');

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/{ts-import-type.js → ts-import-type/ts-import-type.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const {createImportExpression} = require('../expressions/import-expression');
+const {createImportExpression} = require('../../expressions/import-expression');
 
 module.exports.TSImportType = (path, printer) => {
     createImportExpression(path, printer);

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/type/ts-type-literal.js

@@ -25,10 +25,15 @@ module.exports.TSTypeLiteral = (path, {indent, traverse, write}) => {
 };
 
 function isNewline(path) {
-    const members = path.get('members');
+    const {parentPath} = path;
+    
+    const {length} = path.get('members');
     
-    if (members.length === 1 && path.parentPath.isTSTypeParameterInstantiation())
+    if (!length)
         return false;
     
-    return members.length && members[0].node.typeAnnotation;
+    if (length > 1)
+        return true;
+    
+    return !parentPath.isTSTypeParameterInstantiation();
 }

package/package.json

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