@putout/printer 17.9.0 → 17.10.1

package/ChangeLog

@@ -1,3 +1,15 @@
+2026.03.03, v17.10.1
+
+feature:
+- 250f066 @putout/printer: #mark: add
+- 6f44535 @putout/printer: IfStatement: comments with next sibling
+
+2026.03.03, v17.10.0
+
+feature:
+- 76458a6 @putout/printer: IfStatement: trailing comments: improve support
+- 8eebdfb @putout/printer: IfStatement: trailing comments
+
 2026.02.22, v17.9.0
 
 feature:

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

@@ -3,7 +3,7 @@ import {
     hasTrailingComment,
     satisfy,
 } from '#is';
-import {markBefore} from '../mark.js';
+import {markBefore} from '#mark';
 import {maybeInsideFn} from './maybe-inside-fn.js';
 import {
     printLeadingComments,

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

@@ -6,10 +6,12 @@ const {
 } = types;
 
 export const printSeparator = (path, {print}) => {
-    if (isMultiline(path))
+    if (isMultiline(path)) {
         print.breakline();
-    else
-        print.space();
+        return;
+    }
+    
+    print.space();
 };
 
 function isMultiline(path) {

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

@@ -1,6 +1,6 @@
 import {types} from '@putout/babel';
 import {isNext} from '#is';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
 import {maybeDeclare} from '../../maybe/maybe-declare.js';
 import {parseComments} from '../../comment/comment.js';
 import {maybeDecorators} from '../../maybe/maybe-decorators.js';

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

@@ -1,7 +1,7 @@
 import {types} from '@putout/babel';
 import {isNext, isNextParent} from '#is';
 import {printParams} from '#print-params';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
 
 const not = (fn) => (...a) => !fn(...a);
 const notInsideExportDefaultWithBody = not(isInsideExportDefaultWithBody);

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

@@ -3,8 +3,11 @@ export const printKind = (path, {write}) => {
     
     const isGetter = kind === 'get' || kind === 'set';
     
-    if (isGetter)
+    if (isGetter) {
         write(`${kind} `);
-    else if (generator)
+        return;
+    }
+    
+    if (generator)
         write('*');
 };

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

@@ -1,6 +1,6 @@
 import {types} from '@putout/babel';
 import {exists} from '#is';
-import {isMarkedAfter} from '../../mark.js';
+import {isMarkedAfter} from '#mark';
 
 const {
     isExpressionStatement,

package/lib/tokenize/expressions/object-expression/object-property.js

@@ -24,8 +24,11 @@ export const ObjectProperty = (path, printer, semantics) => {
         traverse(value);
     }
     
-    if (manyLines)
+    if (manyLines) {
         maybe.write(!isLast || trailingComma, ',');
-    else if (!isLast && properties.length)
+        return;
+    }
+    
+    if (!isLast && properties.length)
         write(', ');
 };

package/lib/tokenize/printer/printer.js

@@ -1,7 +1,7 @@
 import {fullstore} from 'fullstore';
 import {TYPES} from '#types';
+import {maybeMarkAfter} from '#mark';
 import {createDebug, createLog} from './debug.js';
-import {maybeMarkAfter} from '../mark.js';
 import * as baseVisitors from '../visitors.js';
 import {maybeVisitor, maybeThrow} from '../maybe/index.js';
 import {
@@ -311,4 +311,3 @@ const createAddToken = (tokens) => {
         tokens.push(token);
     };
 };
-

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

@@ -1,4 +1,5 @@
 import {types} from '@putout/babel';
+import {markAfter} from '#mark';
 import {
     isNext,
     isParentProgram,
@@ -6,7 +7,6 @@ import {
     exists,
     satisfy,
 } from '#is';
-import {markAfter} from '../../mark.js';
 import {parseComments} from '../../comment/comment.js';
 import {insideIfWithNoBody} from './inside-if-with-no-body.js';
 import {getDirectives} from './get-directives.js';

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

@@ -11,7 +11,7 @@ import {
     markAfter,
     isMarkedAfter,
     hasPrevNewline,
-} from '../../mark.js';
+} from '#mark';
 
 const {
     isExportNamespaceSpecifier,

package/lib/tokenize/statements/for-of-statement/for-of-statement.js

@@ -8,7 +8,7 @@ import {
     markAfter,
     markBefore,
     isMarkedAfter,
-} from '../../mark.js';
+} from '#mark';
 
 export const ForOfStatement = {
     beforeIf(path) {

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

@@ -1,5 +1,5 @@
 import {isInsideLabel, exists} from '#is';
-import {markAfter} from '../mark.js';
+import {markAfter} from '#mark';
 
 export const ForStatement = {
     print(path, {print, maybe}) {
@@ -26,13 +26,15 @@ export const ForStatement = {
         if (body.body) {
             print.space();
             print('__body');
-        } else {
-            const is = !path.get('body').isEmptyStatement();
-            maybe.print.newline(is);
-            maybe.indent.inc(is);
-            print('__body');
-            maybe.indent.dec(is);
+            
+            return;
         }
+        
+        const is = !path.get('body').isEmptyStatement();
+        maybe.print.newline(is);
+        maybe.indent.inc(is);
+        print('__body');
+        maybe.indent.dec(is);
     },
     afterIf(path) {
         return exists(path.getNextSibling());

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

@@ -0,0 +1,25 @@
+import {types} from '@putout/babel';
+import {isNext} from '#is';
+
+const {isBlockStatement} = types;
+
+export const printTrailingCommentBlock = (path, printer, semantics, {printComment}) => {
+    const {maybe} = printer;
+    const hasNext = isNext(path);
+    
+    maybe.print.breakline(!hasNext);
+    printComment();
+    //maybe.print.breakline(hasNext);
+};
+
+export const printTrailingCommentLine = (path, printer, semantics, {printComment}) => {
+    const {consequent} = path.node;
+    const consequentIsBlock = isBlockStatement(consequent);
+    const {print, maybe} = printer;
+    
+    print.indent();
+    maybe.print.space(!consequentIsBlock);
+    
+    printComment();
+    maybe.print.newline(consequentIsBlock);
+};

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

@@ -4,7 +4,11 @@ import {
     isNext,
     isInsideIf,
 } from '#is';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
+import {
+    printTrailingCommentBlock,
+    printTrailingCommentLine,
+} from './if-statement-comments.js';
 
 const {
     isBlockStatement,
@@ -56,6 +60,8 @@ const isLastEmptyInsideBody = (path) => {
 };
 
 export const IfStatement = {
+    printTrailingCommentBlock,
+    printTrailingCommentLine,
     print: (path, {indent, print, maybe, write, traverse}) => {
         const {parentPath} = path;
         const partOfAlternate = parentPath.get('alternate');

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

@@ -1,7 +1,7 @@
 import {parseImportSpecifiers} from 'parse-import-specifiers';
 import {isLast, isNext} from '#is';
 import {printAttributes} from '#import-attributes';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
 import {
     printTrailingCommentBlock,
     printTrailingCommentLine,

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

@@ -1,4 +1,5 @@
 import {types} from '@putout/babel';
+import {hasPrevNewline} from '#mark';
 import {
     isInsideLabel,
     isPrevBody,
@@ -6,7 +7,6 @@ import {
     isLast,
     isPrevTry,
 } from '#is';
-import {hasPrevNewline} from '../../mark.js';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
 
 const {isJSXElement} = types;

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

@@ -1,4 +1,5 @@
 import {types} from '@putout/babel';
+import {hasPrevNewline} from '#mark';
 import {
     isNext,
     isCoupleLines,
@@ -6,7 +7,6 @@ import {
     exists,
     noTrailingComment,
 } from '#is';
-import {hasPrevNewline} from '../../mark.js';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
 import {isConcatenation} from '../../expressions/binary-expression/concatenate.js';
 import {parseLeadingComments} from '../../comment/comment.js';

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

@@ -1,5 +1,5 @@
 import {isNext} from '#is';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
 
 export const WhileStatement = {
     print(path, {print, indent}) {
@@ -13,12 +13,14 @@ export const WhileStatement = {
         if (path.node.body.body) {
             print.space();
             print('__body');
-        } else {
-            indent.inc();
-            print.newline();
-            print('__body');
-            indent.dec();
+            
+            return;
         }
+        
+        indent.inc();
+        print.newline();
+        print('__body');
+        indent.dec();
     },
     afterIf(path) {
         return isNext(path);

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

@@ -1,5 +1,5 @@
 import {isNext} from '#is';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
 
 export const WithStatement = {
     print(path, {print, indent}) {
@@ -13,12 +13,14 @@ export const WithStatement = {
         if (path.node.body.body) {
             print.space();
             print('__body');
-        } else {
-            indent.inc();
-            print.newline();
-            print('__body');
-            indent.dec();
+            
+            return;
         }
+        
+        indent.inc();
+        print.newline();
+        print('__body');
+        indent.dec();
     },
     afterIf(path) {
         return isNext(path);

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

@@ -3,7 +3,7 @@ import {
     isNextParent,
     isLast,
 } from '#is';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
 
 export const TSEnumDeclaration = {
     beforeIf(path) {

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

@@ -1,7 +1,7 @@
 import {types} from '@putout/babel';
 import {isNext, isNextParent} from '#is';
+import {markAfter} from '#mark';
 import {maybeDeclare} from '../../maybe/maybe-declare.js';
-import {markAfter} from '../../mark.js';
 
 const {
     isTSTypeAliasDeclaration,

package/lib/tokenize/typescript/ts-union-type/ts-union-type.js

@@ -10,10 +10,12 @@ export const TSUnionType = maybeParens({
         const types = path.get('types');
         const {length} = types;
         
-        if (!insideTypeDeclaration(path) || length <= maxTypesInOneLine)
+        if (!insideTypeDeclaration(path) || length <= maxTypesInOneLine) {
             printInOneLine(types, printer);
-        else
-            printInCoupleLines(types, printer);
+            return;
+        }
+        
+        printInCoupleLines(types, printer);
     },
 });
 

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

@@ -3,7 +3,7 @@ import {
     isNext,
     isNextParent,
 } from '#is';
-import {markAfter} from '../../mark.js';
+import {markAfter} from '#mark';
 import {maybeDeclare} from '../../maybe/maybe-declare.js';
 
 const isNextType = (a) => a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "17.9.0",
+  "version": "17.10.1",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -57,6 +57,7 @@
     "#printer": "./lib/printer.js",
     "#test": "./test/create-test.js",
     "#is": "./lib/tokenize/is.js",
+    "#mark": "./lib/tokenize/mark.js",
     "#maybe-parens": "./lib/tokenize/maybe/maybe-parens.js",
     "#print-params": "./lib/tokenize/expressions/function/params.js",
     "#import-attributes": "./lib/tokenize/statements/import-declaration/import-attribute.js",