@putout/printer 17.11.0 → 17.12.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2026.03.03, v17.12.0
+
+feature:
+- aa951ef @putout/printer: IfStatement: trailing comments
+- 3c15683 @putout/printer: isParentBlock: reuse
+
 2026.03.03, v17.11.0
 
 feature:

package/lib/tokenize/expressions/assignment-expression/assignment-expression.js

@@ -1,4 +1,8 @@
 import {maybeParens} from '#maybe-parens';
+import {
+    isParentBlock,
+    isParentProgram,
+} from '#is';
 import {condition} from './maybe-parens-condition.js';
 import {printSeparator} from './print-separator.js';
 import {
@@ -8,8 +12,6 @@ import {
     printLeadingCommentBlock,
 } from './assignment-expression-comments.js';
 
-const isInsideBlock = ({parentPath}) => /BlockStatement|Program/.test(parentPath.type);
-
 export const AssignmentExpression = maybeParens({
     checkParens: false,
     condition,
@@ -25,7 +27,7 @@ export const AssignmentExpression = maybeParens({
         printSeparator(path, printer);
         print('__right');
         
-        if (isInsideBlock(path)) {
+        if (isParentBlock(path) || isParentProgram(path)) {
             print(';');
             print.breakline();
         }
@@ -36,3 +38,4 @@ export const AssignmentExpression = maybeParens({
 
 AssignmentExpression.printLeadingCommentLine = printLeadingCommentLine;
 AssignmentExpression.printLeadingCommentBlock = printLeadingCommentBlock;
+

package/lib/tokenize/expressions/function/function-declaration.js

@@ -51,7 +51,7 @@ export const FunctionDeclaration = {
         print.space();
         print('__body');
     },
-    afterSatisfy: () => [isNext, isNextParent, isInsideBlockStatement],
+    afterSatisfy: () => [isNext, isNextParent, isInsideBlockLike],
     after(path, {indent, maybe}) {
         if (isNextAssign(path) || isNextFunction(path) || isNext(path))
             indent();
@@ -75,7 +75,7 @@ const isNextAssign = (path) => {
     return isAssignmentExpression(next.node.expression);
 };
 
-function isInsideBlockStatement(path) {
+function isInsideBlockLike(path) {
     const {parentPath} = path;
     
     if (isTSModuleBlock(parentPath.parentPath))

package/lib/tokenize/is.js

@@ -16,6 +16,7 @@ const {
 
 export const isParentProgram = (path) => path.parentPath?.isProgram();
 export const isParentBlock = (path) => path.parentPath.isBlockStatement();
+export const isInsideBlockLike = (path) => /^(Program|BlockStatement|TSModuleBlock|SwitchCase)$/.test(path.parentPath.type);
 
 export const isNext = (path) => {
     const next = path.getNextSibling();
@@ -177,3 +178,4 @@ export const hasLeadingComment = (path) => path.node?.leadingComments?.length;
 
 export const noTrailingComment = (path) => !path.node.trailingComments?.length;
 export const noLeadingComment = (path) => !path.node.leadingComments?.length;
+

package/lib/tokenize/statements/block-statement/block-statement.js

@@ -6,6 +6,7 @@ import {
     isLast,
     exists,
     satisfy,
+    isParentBlock,
 } from '#is';
 import {parseComments} from '../../comment/comment.js';
 import {insideIfWithNoBody} from './inside-if-with-no-body.js';
@@ -18,7 +19,6 @@ const {
     isFunctionDeclaration,
     isExportDeclaration,
     isDoWhileStatement,
-    isBlockStatement,
     isArrayExpression,
 } = types;
 
@@ -127,7 +127,6 @@ const NEWLINE = true;
 const NO_NEWLINE = false;
 
 const isInsideDoWhile = ({parentPath}) => isDoWhileStatement(parentPath);
-const isInsideBlock = ({parentPath}) => isBlockStatement(parentPath);
 
 const isNoNewline = satisfy([
     isInsideDoWhile,
@@ -136,7 +135,7 @@ const isNoNewline = satisfy([
 ]);
 
 function shouldAddNewlineAfter(path) {
-    if (isInsideBlock(path))
+    if (isParentBlock(path))
         return NEWLINE;
     
     if (isNoNewline(path))

package/lib/tokenize/statements/debugger-statement.js

@@ -1,6 +1,8 @@
-import {isNext, isInsideIf} from '#is';
-
-const isInsideBlock = (path) => path.parentPath.isBlockStatement();
+import {
+    isNext,
+    isInsideIf,
+    isParentBlock,
+} from '#is';
 
 export const DebuggerStatement = {
     print(path, {print, indent}) {
@@ -9,7 +11,7 @@ export const DebuggerStatement = {
     },
     afterSatisfy: () => [
         isNext,
-        isInsideBlock,
+        isParentBlock,
         isInsideIf,
     ],
     after(path, {print}) {

package/lib/tokenize/statements/if-statement/if-statement-comments.js

@@ -1,5 +1,5 @@
 import {types} from '@putout/babel';
-import {isNext} from '#is';
+import {isNext, isParentBlock} from '#is';
 
 const {isBlockStatement} = types;
 
@@ -12,13 +12,18 @@ export const printTrailingCommentBlock = (path, printer, semantics, {printCommen
 };
 
 export const printTrailingCommentLine = (path, printer, semantics, {printComment}) => {
+    const hasNext = isNext(path);
     const {consequent} = path.node;
     const consequentIsBlock = isBlockStatement(consequent);
-    const {print, maybe} = printer;
+    const {print} = printer;
     
     print.indent();
-    maybe.print.space(!consequentIsBlock);
+    
+    if (!hasNext && !consequentIsBlock)
+        print.space();
     
     printComment();
-    maybe.print.newline(consequentIsBlock);
+    
+    if (hasNext || isParentBlock(path))
+        print.newline();
 };

package/lib/tokenize/statements/try-statement/try-statements.js

@@ -1,5 +1,9 @@
 import {types} from '@putout/babel';
-import {isNext, isNextTry} from '#is';
+import {
+    isNext,
+    isNextTry,
+    isParentBlock,
+} from '#is';
 
 const {isExpressionStatement} = types;
 
@@ -34,6 +38,7 @@ const isNextExpression = (path) => {
 };
 
 export const CatchClause = (path, {print, maybe}) => {
+    const {parentPath} = path;
     const param = path.get('param');
     const body = path.get('body');
     
@@ -50,9 +55,5 @@ export const CatchClause = (path, {print, maybe}) => {
     }
     
     print(body);
-    maybe.print.newline(isInsideBlock(path));
+    maybe.print.newline(isParentBlock(parentPath));
 };
-
-function isInsideBlock(path) {
-    return path.parentPath.parentPath.isBlockStatement();
-}

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

@@ -6,6 +6,7 @@ import {
     isNewlineBetweenSiblings,
     exists,
     noTrailingComment,
+    isInsideBlockLike,
 } from '#is';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
 import {isConcatenation} from '../../expressions/binary-expression/concatenate.js';
@@ -16,7 +17,6 @@ const {isExportDeclaration} = types;
 
 const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isParentBlock = (path) => /Program|BlockStatement|Export|LabeledStatement/.test(path.parentPath.type);
-const isInsideBlock = (path) => /^(Program|BlockStatement|TSModuleBlock|SwitchCase)$/.test(path.parentPath.type);
 const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
 const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
 const isParentIf = (path) => path.parentPath.isIfStatement();
@@ -29,7 +29,7 @@ export const VariableDeclaration = {
     print: maybeDeclare((path, {maybe, store, write, traverse, print, indent}, semantics) => {
         const {maxVariablesInOneLine} = semantics;
         
-        maybe.indent(isInsideBlock(path));
+        maybe.indent(isInsideBlockLike(path));
         
         write(path.node.kind);
         maybeSpaceAfterKeyword(path, {

package/package.json

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