@putout/printer 18.3.5 → 18.3.6

package/ChangeLog

@@ -1,3 +1,11 @@
+2026.03.10, v18.3.6
+
+feature:
+- a3281ef @putout/printer: ObjectExpression: isMultiline
+- da64dc7 @putout/printer: ObjectExpression: isCommaAfterProperty
+- 69ff480 @putout/printer: ObjectExpression: hasTrailingComment
+- 50f7e07 @putout/printer: ObjectExpression: isIndentBeforeClosingCurlyBrace
+
 2026.03.10, v18.3.5
 
 feature:

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

@@ -0,0 +1,24 @@
+import {createTypeChecker} from '#type-checker';
+import {
+    isMultilineOption,
+    isTrailingCommaOption,
+} from '../array-expression/is.js';
+
+const isCouple = (a) => a > 1;
+const isLastProperty = ({node, parentPath}) => node === parentPath.node.properties.at(-1);
+
+const isCoupleOrManyLines = createTypeChecker([
+    ['+: parentPath.node.properties.length ->', isCouple],
+    ['+', isMultilineOption],
+]);
+
+const isLastOrTrailingComma = createTypeChecker([
+    ['+: -> !', isLastProperty],
+    ['+', isTrailingCommaOption],
+]);
+
+export const isCommaAfterProperty = createTypeChecker([
+    ['-: -> !SpreadElement'],
+    ['-: -> !', isCoupleOrManyLines],
+    ['+', isLastOrTrailingComma],
+]);

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

@@ -4,17 +4,21 @@ import {
     isCoupleLines,
     isForOf,
     isIf,
-    noTrailingComment,
     isNewlineBetweenSiblings,
     hasLeadingComment,
-    exists,
     isInsideCall,
     isInsideBody,
     isInsideExpression,
+    callWithNext,
+    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 {isCommaAfterProperty} from './comma.js';
+import {isMultilineOption} from '../array-expression/is.js';
+
+const hasNextLeadingComment = callWithNext(hasLeadingComment);
 
 const notLastArgInsideCall = (path) => {
     const {parentPath} = path;
@@ -31,7 +35,10 @@ const notLastArgInsideCall = (path) => {
 const hasNoProperties = (path) => !path.node.properties.length;
 const hasValue = (path) => path.node.properties[0].value;
 
-const {isMemberExpression} = types;
+const {
+    isMemberExpression,
+    isSpreadElement,
+} = types;
 
 const isParens = createTypeChecker([isInsideBody, isInsideExpression]);
 
@@ -55,7 +62,7 @@ const isInsideTupleLike = createTypeChecker([
     ['+: parentPath.parentPath.node.elements.0 -> StringLiteral'],
 ]);
 
-export const isManyLines = createTypeChecker([
+export const isMultiline = createTypeChecker([
     ['-', hasNoProperties],
     ['-: parentPath -> ForOfStatement'],
     ['+: node.properties.0 -> SpreadElement'],
@@ -66,10 +73,8 @@ export const isManyLines = createTypeChecker([
     ['+', hasValue],
 ]);
 
-const isManyLinesOption = (a, {manyLines}) => manyLines;
-
 const isIndentBeforeProperty = createTypeChecker([
-    ['-: -> !', isManyLinesOption],
+    ['-: -> !', isMultilineOption],
     ['+: -> !', hasLeadingComment],
 ]);
 
@@ -88,23 +93,20 @@ export const ObjectExpression = (path, printer, semantics) => {
     const properties = path.get('properties');
     const {length} = properties;
     const parens = isParens(path);
-    const manyLines = isManyLines(path);
+    const multiline = isMultiline(path);
     
     maybe.print(parens, '(');
     print('{');
     parseComments(path, printer, semantics);
-    maybe.print.newline(manyLines);
-    
-    const n = properties.length - 1;
+    maybe.print.newline(multiline);
     
     const memberCallee = isMemberExpressionCallee(path);
     maybe.indent.inc(memberCallee);
     
-    for (const [index, property] of properties.entries()) {
+    for (const property of properties) {
         const couple = length > 1;
-        const isLast = index === n;
         
-        if (isIndentBeforeProperty(property, {manyLines}))
+        if (isIndentBeforeProperty(property, {multiline}))
             indent();
         
         print(property);
@@ -112,29 +114,28 @@ export const ObjectExpression = (path, printer, semantics) => {
         if (property.isObjectMethod())
             continue;
         
-        if (property.isSpreadElement()) {
-            if (noTrailingComment(property) && (couple || manyLines)) {
-                maybe.print(!isLast || trailingComma, ',');
-                print.newline();
-            }
-            
+        if (hasTrailingComment(property))
             continue;
-        }
         
-        if (noTrailingComment(property) && !hasNextLeadingComment(property)) {
-            maybe.print.newline(manyLines);
-            maybe.print.linebreak(isNewlineBetweenSiblings(property));
-        }
+        maybe.print(isCommaAfterProperty(property, {
+            multiline,
+            trailingComma,
+        }), ',');
+        
+        if (!isSpreadElement(property) && !hasNextLeadingComment(property) && multiline || property.isSpreadElement() && (couple || multiline))
+            print.newline();
+        
+        if (!isSpreadElement(property) && !hasNextLeadingComment(property) && isNewlineBetweenSiblings(property))
+            print.linebreak();
     }
     
     indent.dec();
     
-    if (!insideNestedArrayCall) {
-        maybe.indent(manyLines);
-    } else if (isInsideTupleLike(path)) {
+    if (isIndentBeforeClosingCurlyBrace(path, {multiline}))
         indent();
+    
+    if (insideNestedArrayCall)
         indent.inc();
-    }
     
     print('}');
     maybe.print(parens, ')');
@@ -142,11 +143,8 @@ export const ObjectExpression = (path, printer, semantics) => {
     maybe.indent.dec(memberCallee);
 };
 
-const hasNextLeadingComment = (path) => {
-    const next = path.getNextSibling();
-    
-    if (!exists(next))
-        return false;
-    
-    return hasLeadingComment(next);
-};
+const isIndentBeforeClosingCurlyBrace = createTypeChecker([
+    ['+', isInsideTupleLike],
+    ['-: -> !', isMultilineOption],
+    ['+: -> !', isInsideNestedArrayCall],
+]);

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

@@ -1,5 +1,5 @@
 import {isConcatenation} from '../binary-expression/concatenate.js';
-import {isManyLines} from './object-expression.js';
+import {isMultiline} from './object-expression.js';
 import {printKey} from './print-key.js';
 
 export const ObjectProperty = (path, printer, semantics) => {
@@ -14,7 +14,7 @@ export const ObjectProperty = (path, printer, semantics) => {
     const value = path.get('value');
     const properties = path.parentPath.get('properties');
     const isLast = path === properties.at(-1);
-    const manyLines = isManyLines(path.parentPath);
+    const multiline = isMultiline(path.parentPath);
     
     printKey(path, printer);
     
@@ -24,7 +24,7 @@ export const ObjectProperty = (path, printer, semantics) => {
         traverse(value);
     }
     
-    if (manyLines) {
+    if (multiline) {
         maybe.write(!isLast || trailingComma, ',');
         return;
     }

package/package.json

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