@putout/printer 18.3.3 → 18.3.5

package/ChangeLog

@@ -1,3 +1,14 @@
+2026.03.10, v18.3.5
+
+feature:
+- 8a3ffb9 @putout/printer: ObjectExpression: isIndentBeforeProperty
+- 3d450fc @putout/printer: ObjectExpression: indent
+
+2026.03.10, v18.3.4
+
+feature:
+- d3410bd @putout/printer: BlockStatement: simplify
+
 2026.03.09, v18.3.3
 
 feature:

package/lib/tokenize/expressions/function/object-method.js

@@ -1,5 +1,9 @@
-import {isNewlineBetweenSiblings} from '#is';
+import {
+    isNewlineBetweenSiblings,
+    isNext,
+} from '#is';
 import {printParams} from '#print-params';
+import {markAfter} from '#mark';
 import {printKey} from '../object-expression/print-key.js';
 import {printKind} from './kind.js';
 
@@ -11,6 +15,7 @@ export const ObjectMethod = {
         write('async ');
     },
     print(path, printer, semantics) {
+        const {trailingComma} = semantics;
         const {print} = printer;
         
         printKind(path, printer);
@@ -19,6 +24,12 @@ export const ObjectMethod = {
         
         print.space();
         print('__body');
+        
+        if (isNext(path) || trailingComma)
+            print(',');
+        
+        print.newline();
+        markAfter(path);
     },
     afterIf(path) {
         return isNewlineBetweenSiblings(path);

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

@@ -6,7 +6,6 @@ import {
     isIf,
     noTrailingComment,
     isNewlineBetweenSiblings,
-    noLeadingComment,
     hasLeadingComment,
     exists,
     isInsideCall,
@@ -32,12 +31,7 @@ const notLastArgInsideCall = (path) => {
 const hasNoProperties = (path) => !path.node.properties.length;
 const hasValue = (path) => path.node.properties[0].value;
 
-const {
-    isMemberExpression,
-    isLogicalExpression,
-} = types;
-
-const isLogicalArgument = (path) => isLogicalExpression(path.node.argument);
+const {isMemberExpression} = types;
 
 const isParens = createTypeChecker([isInsideBody, isInsideExpression]);
 
@@ -72,6 +66,13 @@ export const isManyLines = createTypeChecker([
     ['+', hasValue],
 ]);
 
+const isManyLinesOption = (a, {manyLines}) => manyLines;
+
+const isIndentBeforeProperty = createTypeChecker([
+    ['-: -> !', isManyLinesOption],
+    ['+: -> !', hasLeadingComment],
+]);
+
 export const ObjectExpression = (path, printer, semantics) => {
     const {trailingComma} = semantics;
     const {
@@ -100,39 +101,37 @@ export const ObjectExpression = (path, printer, semantics) => {
     maybe.indent.inc(memberCallee);
     
     for (const [index, property] of properties.entries()) {
+        const couple = length > 1;
+        const isLast = index === n;
+        
+        if (isIndentBeforeProperty(property, {manyLines}))
+            indent();
+        
+        print(property);
+        
+        if (property.isObjectMethod())
+            continue;
+        
         if (property.isSpreadElement()) {
-            const logical = isLogicalArgument(property);
-            
-            if (noLeadingComment(property))
-                maybe.indent(length > 1 || logical || manyLines);
-            
-            print(property);
-            
-            if (noTrailingComment(property) && (length > 1 || manyLines)) {
-                maybe.print(index !== n || trailingComma, ',');
+            if (noTrailingComment(property) && (couple || manyLines)) {
+                maybe.print(!isLast || trailingComma, ',');
                 print.newline();
             }
             
             continue;
         }
         
-        maybe.indent(manyLines && noLeadingComment(property));
-        print(property);
-        
-        if (property.isObjectMethod())
-            continue;
-        
         if (noTrailingComment(property) && !hasNextLeadingComment(property)) {
             maybe.print.newline(manyLines);
             maybe.print.linebreak(isNewlineBetweenSiblings(property));
         }
     }
     
+    indent.dec();
+    
     if (!insideNestedArrayCall) {
-        indent.dec();
         maybe.indent(manyLines);
     } else if (isInsideTupleLike(path)) {
-        indent.dec();
         indent();
         indent.inc();
     }

package/lib/tokenize/is.js

@@ -209,4 +209,3 @@ export const hasTrailingComment = (path) => {
 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-newline.js

@@ -68,6 +68,7 @@ export const shouldAddNewlineAfter = createTypeChecker([
     ['-', isLooksLikeInsideFn],
     ['-', isLast],
     ['-', isExportFunction],
+    ['-: parentPath -> ObjectMethod'],
     ['+: -> !', isNextIfAlternate],
 ]);
 

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

@@ -1,15 +1,11 @@
 import {types} from '@putout/babel';
 import {markAfter} from '#mark';
-import {isNext} from '#is';
 import {parseComments} from '../../comment/comment.js';
 import {getDirectives} from './get-directives.js';
 import {isCallInsideChain} from './is-call-inside-chain.js';
 import {shouldAddNewlineAfter} from './block-statement-newline.js';
 
-const {
-    isObjectMethod,
-    isArrayExpression,
-} = types;
+const {isArrayExpression} = types;
 
 const isFirstStatement = (path) => path.node.body[0];
 const isFirstDirective = (path) => path.node.directives?.[0];
@@ -27,7 +23,6 @@ const isInsideArrayTupleOfThree = (path) => {
 
 export const BlockStatement = {
     print(path, printer, semantics) {
-        const {trailingComma} = semantics;
         const {
             indent,
             maybe,
@@ -70,11 +65,6 @@ export const BlockStatement = {
         write('}');
         
         maybe.indent.dec(callInsideChain);
-        
-        const {parentPath} = path;
-        
-        if (isObjectMethod(parentPath))
-            maybe.write(isNext(parentPath) || trailingComma, ',');
     },
     afterIf: shouldAddNewlineAfter,
     after(path, {write}) {

package/package.json

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