@putout/printer 14.7.1 → 14.7.2

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.05.03, v14.7.2
+
+feature:
+- ec635c3 @putout/printer: ImportDeclaration: printTrailingCommentsBlock
+
 2025.05.03, v14.7.1
 
 feature:

package/lib/tokenize/comment/comments-printer/comments-printer.js

@@ -1,19 +1,50 @@
 'use strict';
 
-const createPrintComment = (fn, value) => () => fn(`//${value}`);
+const createPrintCommentLine = (fn, value) => () => fn(`//${value}`);
+const createPrintCommentBlock = (fn, value) => () => fn(`/*${value}*/\n`);
 
-module.exports.hasCommentsPrinter = (currentTraverse) => currentTraverse.printLeadingCommentLine;
+module.exports.hasTrailingCommentsPrinter = (currentTraverse) => {
+    const {printTrailingCommentBlock} = currentTraverse;
+    
+    return Boolean(printTrailingCommentBlock);
+};
+
+module.exports.hasLeadingCommentsPrinter = (currentTraverse) => {
+    const {printLeadingCommentLine} = currentTraverse;
+    
+    return Boolean(printLeadingCommentLine);
+};
 
-module.exports.printComments = (path, printer, semantics, {currentTraverse}) => {
+module.exports.printLeadingComments = (path, printer, semantics, {currentTraverse}) => {
     const {print} = printer;
-    const {leadingComments} = path.node;
+    const {
+        leadingComments = [],
+    } = path.node;
+    
     const {printLeadingCommentLine} = currentTraverse;
     
     for (const [index, {type, value}] of leadingComments.entries()) {
         if (type === 'CommentLine')
-            printLeadingCommentLine(path, printer, semantics, {
+            printLeadingCommentLine?.(path, printer, semantics, {
+                index,
+                printComment: createPrintCommentLine(print, value),
+            });
+    }
+};
+
+module.exports.printTrailingComments = (path, printer, semantics, {currentTraverse}) => {
+    const {print} = printer;
+    const {
+        trailingComments = [],
+    } = path.node;
+    
+    const {printTrailingCommentBlock} = currentTraverse;
+    
+    for (const [index, {type, value}] of trailingComments.entries()) {
+        if (type === 'CommentBlock')
+            printTrailingCommentBlock?.(path, printer, semantics, {
                 index,
-                printComment: createPrintComment(print, value),
+                printComment: createPrintCommentBlock(print, value),
             });
     }
 };

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

@@ -11,8 +11,8 @@ const {markBefore} = require('../mark');
 const {maybeInsideFn} = require('./maybe-inside-fn');
 
 const {
-    hasCommentsPrinter,
-    printComments,
+    printLeadingComments,
+    hasLeadingCommentsPrinter,
 } = require('./comments-printer/comments-printer');
 
 const {
@@ -107,8 +107,8 @@ module.exports.parseLeadingComments = (path, printer, semantics, {currentTravers
     if (!leadingComments?.length)
         return;
     
-    if (hasCommentsPrinter(currentTraverse))
-        return printComments(path, printer, semantics, {
+    if (hasLeadingCommentsPrinter(currentTraverse))
+        return printLeadingComments(path, printer, semantics, {
             currentTraverse,
         });
     

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

@@ -10,12 +10,16 @@ const {
 
 const {isLooksLikeChain} = require('../expressions/member-expression/is-looks-like-chain');
 
+const {
+    printTrailingComments,
+    hasTrailingCommentsPrinter,
+} = require('./comments-printer/comments-printer');
+
 const {
     isDecorator,
     isMemberExpression,
     isExpressionStatement,
     isCallExpression,
-    isImportDeclaration,
 } = types;
 
 const hasBody = (path) => {
@@ -91,8 +95,13 @@ function isCommentOnNextLine(path) {
     return isNextLine || isNextLineAfterNewline;
 }
 
-module.exports.parseTrailingComments = (path, {write, maybe, indent}, semantics) => {
+module.exports.parseTrailingComments = (path, printer, semantics, {currentTraverse} = {}) => {
     const {parentPath} = path;
+    const {
+        write,
+        maybe,
+        indent,
+    } = printer;
     
     if (!semantics.comments)
         return;
@@ -102,6 +111,11 @@ module.exports.parseTrailingComments = (path, {write, maybe, indent}, semantics)
     if (!trailingComments?.length)
         return;
     
+    if (hasTrailingCommentsPrinter(currentTraverse))
+        return printTrailingComments(path, printer, semantics, {
+            currentTraverse,
+        });
+    
     if (path.isDirective())
         return;
     
@@ -139,7 +153,7 @@ module.exports.parseTrailingComments = (path, {write, maybe, indent}, semantics)
         if (type === 'CommentBlock') {
             maybe.write.space(sameLine);
             maybe.indent(!sameLine);
-            maybe.print.breakline(isPrevCall(path) || isImportNotBeforeExport(path));
+            maybe.print.breakline(isPrevCall(path));
             write(`/*${value}*/`);
             maybe.write.newline(!sameLine || !isFnParam(path) && isCoupleLines(path.parentPath));
         }
@@ -159,10 +173,3 @@ function isPrevCall(path) {
     
     return !isCallExpression(expression.arguments[0]);
 }
-
-function isImportNotBeforeExport(path) {
-    if (!isImportDeclaration(path))
-        return false;
-    
-    return !path.getNextSibling().isExportDeclaration();
-}

package/lib/tokenize/statements/import-declaration/import-declaration.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {parseImportSpecifiers} = require('parse-import-specifiers');
-
+const {types} = require('@putout/babel');
 const {markAfter} = require('../../mark');
 const {isLast, isNext} = require('../../is');
 
@@ -10,6 +10,8 @@ const {
     ImportAttribute,
 } = require('./import-attribute');
 
+const {isExportDeclaration} = types;
+
 module.exports.ImportAttribute = ImportAttribute;
 module.exports.ImportDeclaration = {
     print(path, printer, semantics) {
@@ -134,3 +136,12 @@ function parseMaxSpecifiers(imports, semantics) {
     
     return maxSpecifiersInOneLine;
 }
+
+module.exports.ImportDeclaration.printTrailingCommentBlock = (path, printer, semantics, {printComment}) => {
+    const {maybe} = printer;
+    const next = path.getNextSibling();
+    
+    maybe.print.breakline(!isExportDeclaration(next));
+    printComment();
+};
+

package/lib/tokenize/tokenize.js

@@ -231,7 +231,9 @@ module.exports.tokenize = (ast, overrides) => {
         
         // this is main thing
         maybeVisitor(currentTraverse, path, printer, semantics);
-        parseTrailingComments(path, printer, semantics);
+        parseTrailingComments(path, printer, semantics, {
+            currentTraverse,
+        });
         maybeThrow(i !== currentIndent, path, `☝️Looks like indent level changed after token visitor: '{{ type }}', for code: '{{ path }}'`);
         
         debug(path.type);

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

@@ -44,6 +44,7 @@ module.exports.TSParameterProperty = (path, {print, maybe, indent}) => {
     if (hasLeadingComment(path) && !path.node.decorators)
         print.breakline();
 };
+
 module.exports.TSParameterProperty.printLeadingCommentLine = (path, printer, semantics, {printComment}) => {
     const {indent, print} = printer;
     

package/package.json

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