@putout/printer 18.4.5 → 18.4.7

package/ChangeLog

@@ -1,3 +1,14 @@
+2026.03.12, v18.4.7
+
+feature:
+- de587ba @putout/printer: private imports: comments
+
+2026.03.12, v18.4.6
+
+feature:
+- 7c290de @putout/printer: BlockStatement: simplify
+- 0dc390f @putout/printer: BlockStatement: indent
+
 2026.03.12, v18.4.5
 
 feature:

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

@@ -7,7 +7,7 @@ import {
     isInsideExportDeclaration,
     isNext,
 } from '#is';
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 import {maybeDecorators} from '../../maybe/maybe-decorators.js';
 
 const isFunctionLike = (path) => isFunction(path.parentPath.parentPath);

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

@@ -1,4 +1,4 @@
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 
 const noop = () => {};
 const parseParams = (path) => path.get('params');

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

@@ -1,5 +1,6 @@
 import {types} from '@putout/babel';
 import {createTypeChecker} from '#type-checker';
+import {parseComments} from '#comments';
 import {
     isCoupleLines,
     isForOf,
@@ -10,7 +11,6 @@ import {
     isInsideExpression,
     hasTrailingComment,
 } from '#is';
-import {parseComments} from '../../comment/comment.js';
 import {isInsideTuple} from './is-inside-tuple.js';
 import {isLooksLikeChain} from '../member-expression/is-looks-like-chain.js';
 import {isCommaAfterSpread} from './comma.js';

package/lib/tokenize/jsx/index.js

@@ -1,5 +1,5 @@
 import {isCoupleLines} from '#is';
-import {parseComments} from '../comment/comment.js';
+import {parseComments} from '#comments';
 
 export {JSXElement} from './jsx-element.js';
 export {JSXAttribute} from './jsx-attribute.js';

package/lib/tokenize/printer/printer.js

@@ -1,13 +1,13 @@
 import {fullstore} from 'fullstore';
 import {TYPES} from '#types';
 import {maybeMarkAfter} from '#mark';
-import {createDebug, createLog} from './debug.js';
-import * as baseVisitors from '../visitors.js';
-import {maybeVisitor, maybeThrow} from '../maybe/index.js';
 import {
     parseLeadingComments,
     parseTrailingComments,
-} from '../comment/comment.js';
+} from '#comments';
+import {createDebug, createLog} from './debug.js';
+import * as baseVisitors from '../visitors.js';
+import {maybeVisitor, maybeThrow} from '../maybe/index.js';
 import {parseOverrides} from '../overrides/overrides.js';
 import {createIndent} from './indent.js';
 

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

@@ -1,27 +1,35 @@
-import {types} from '@putout/babel';
 import {markAfter} from '#mark';
-import {parseComments} from '../../comment/comment.js';
+import {createTypeChecker} from '#type-checker';
+import {isInsideBlock} from '#is';
+import {parseComments} from '#comments';
 import {getDirectives} from './get-directives.js';
 import {isCallInsideChain} from './is-call-inside-chain.js';
 import {shouldAddNewlineAfter} from './block-statement-newline.js';
 
-const {isArrayExpression} = types;
+const isThree = (a) => a === 3;
 
-const isFirstStatement = (path) => path.node.body[0];
-const isFirstDirective = (path) => path.node.directives?.[0];
+const isInsideArrayTupleOfThree = createTypeChecker([
+    ['-: parentPath.parentPath -> !ArrayExpression'],
+    ['+: parentPath.parentPath.node.elements.length', isThree],
+]);
 
-const isInsideArrayTupleOfThree = (path) => {
-    const {parentPath} = path.parentPath;
-    
-    if (!isArrayExpression(parentPath))
-        return false;
-    
-    const {length} = parentPath.node.elements;
-    
-    return length === 3;
-};
+const hasDirectives = (a) => getDirectives(a).length;
+
+const isNewLineAfterOpenCurlyBrace = createTypeChecker([
+    ['+', hasDirectives],
+    ['+: node.body.length', Boolean],
+]);
+
+const isLinebreakAfterDirectives = createTypeChecker([
+    ['-: node.body.length -> !', Boolean],
+    ['+', hasDirectives],
+]);
 
 export const BlockStatement = {
+    beforeIf: isInsideBlock,
+    before: (path, {indent}) => {
+        indent();
+    },
     print(path, printer, semantics) {
         const {
             indent,
@@ -32,22 +40,21 @@ export const BlockStatement = {
         
         const body = path.get('body');
         const directives = getDirectives(path);
-        
-        if (path.parentPath.isBlockStatement())
-            indent();
-        
         const insideArray = isInsideArrayTupleOfThree(path);
+        
         maybe.indent.inc(!insideArray);
         write('{');
         
-        if (isFirstStatement(path) || isFirstDirective(path))
+        if (isNewLineAfterOpenCurlyBrace(path))
             write.newline();
         
         for (const directive of directives) {
             traverse(directive);
         }
         
-        maybe.write.linebreak(directives.length && body.length);
+        if (isLinebreakAfterDirectives(path))
+            write.linebreak();
+        
         const callInsideChain = isCallInsideChain(path);
         
         maybe.indent.inc(callInsideChain);

package/lib/tokenize/statements/program/program.js

@@ -1,5 +1,5 @@
 import {hasCoupleTrailingComments} from '#is';
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 import {getDirectives} from '../block-statement/get-directives.js';
 
 export const Program = (path, printer, semantics) => {

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

@@ -3,7 +3,7 @@ import {
     exists,
     isLast,
 } from '#is';
-import {parseLeadingComments} from '../../comment/comment.js';
+import {parseLeadingComments} from '#comments';
 import {maybeSpaceAfterKeyword} from '../return-statement/maybe-space-after-keyword.js';
 
 export const SwitchStatement = {

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

@@ -3,6 +3,7 @@ import {hasPrevNewline} from '#mark';
 import {createTypeChecker} from '#type-checker';
 import {isConcatenation} from '#is-concatenation';
 import {maybeDeclare} from '#maybe-declare';
+import {parseLeadingComments} from '#comments';
 import {
     isNext,
     isCoupleLines,
@@ -19,7 +20,6 @@ import {
     callWithParent,
 } from '#is';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
-import {parseLeadingComments} from '../../comment/comment.js';
 
 const {isExportDeclaration} = types;
 

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

@@ -1,4 +1,4 @@
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 
 export const TSInterfaceBody = (path, printer, semantics) => {
     const body = path.get('body');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "18.4.5",
+  "version": "18.4.7",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -70,7 +70,8 @@
     "#type-checker": "./lib/tokenize/type-checker/type-checker.js",
     "#type-checker/instrument": "./lib/tokenize/type-checker/instrument.js",
     "#type-checker/report": "./lib/tokenize/type-checker/report.js",
-    "#is-concatenation": "./lib/tokenize/expressions/binary-expression/is-concatenation.js"
+    "#is-concatenation": "./lib/tokenize/expressions/binary-expression/is-concatenation.js",
+    "#comments": "./lib/tokenize/comments/comments.js"
   },
   "devDependencies": {
     "@babel/parser": "^7.28.5",