@putout/printer 18.3.6 → 18.4.0

package/ChangeLog

@@ -1,3 +1,11 @@
+2026.03.10, v18.4.0
+
+feature:
+- 3bcdf4b @putout/printer: ObjectExpression: callWithCallee
+- e205336 @putout/printer: ObjectExpression: isNewlineAfterProperty
+- c4f998d @putout/printer: ObjectExpression: comma: simplify
+- 2a49a3f @putout/printer: ObjectExpression: isLinebreakAfterProperty
+
 2026.03.10, v18.3.6
 
 feature:

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

@@ -4,21 +4,11 @@ import {
     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],
+    ['-: -> !', isMultilineOption],
+    ['+: -> !', isLastProperty],
+    ['+', isTrailingCommaOption],
 ]);

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

@@ -0,0 +1,12 @@
+import {createTypeChecker} from '#type-checker';
+import {
+    callWithNext,
+    hasLeadingComment,
+    isNewlineBetweenSiblings,
+} from '#is';
+
+export const isLinebreakAfterProperty = createTypeChecker([
+    ['-: -> SpreadElement'],
+    ['-', callWithNext(hasLeadingComment)],
+    ['+', isNewlineBetweenSiblings],
+]);

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

@@ -0,0 +1,12 @@
+import {createTypeChecker} from '#type-checker';
+import {
+    callWithNext,
+    hasLeadingComment,
+} from '#is';
+import {isMultilineOption} from '../array-expression/is.js';
+
+export const isNewlineAfterProperty = createTypeChecker([
+    ['-: -> !', isMultilineOption],
+    ['+: -> SpreadElement'],
+    ['+: -> !', callWithNext(hasLeadingComment)],
+]);

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

@@ -4,12 +4,10 @@ import {
     isCoupleLines,
     isForOf,
     isIf,
-    isNewlineBetweenSiblings,
     hasLeadingComment,
     isInsideCall,
     isInsideBody,
     isInsideExpression,
-    callWithNext,
     hasTrailingComment,
 } from '#is';
 import {parseComments} from '../../comment/comment.js';
@@ -17,8 +15,8 @@ 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);
+import {isLinebreakAfterProperty} from './linebreak.js';
+import {isNewlineAfterProperty} from './newline.js';
 
 const notLastArgInsideCall = (path) => {
     const {parentPath} = path;
@@ -35,19 +33,16 @@ const notLastArgInsideCall = (path) => {
 const hasNoProperties = (path) => !path.node.properties.length;
 const hasValue = (path) => path.node.properties[0].value;
 
-const {
-    isMemberExpression,
-    isSpreadElement,
-} = types;
+const {isMemberExpression} = types;
 
 const isParens = createTypeChecker([isInsideBody, isInsideExpression]);
 
-const getCallee = (fn) => (a) => fn(a.get('callee'));
+const callWithCallee = (fn) => (a) => fn(a.get('callee'));
 
 const isMemberExpressionCallee = createTypeChecker([
     ['-: parentPath -> !CallExpression'],
-    ['-: parentPath -> !', getCallee(isMemberExpression)],
-    ['+: parentPath', getCallee(isLooksLikeChain)],
+    ['-: parentPath -> !', callWithCallee(isMemberExpression)],
+    ['+: parentPath', callWithCallee(isLooksLikeChain)],
 ]);
 
 const isInsideNestedArrayCall = createTypeChecker([
@@ -91,7 +86,7 @@ export const ObjectExpression = (path, printer, semantics) => {
     maybe.indent.inc(!insideNestedArrayCall);
     
     const properties = path.get('properties');
-    const {length} = properties;
+    
     const parens = isParens(path);
     const multiline = isMultiline(path);
     
@@ -104,8 +99,6 @@ export const ObjectExpression = (path, printer, semantics) => {
     maybe.indent.inc(memberCallee);
     
     for (const property of properties) {
-        const couple = length > 1;
-        
         if (isIndentBeforeProperty(property, {multiline}))
             indent();
         
@@ -122,10 +115,10 @@ export const ObjectExpression = (path, printer, semantics) => {
             trailingComma,
         }), ',');
         
-        if (!isSpreadElement(property) && !hasNextLeadingComment(property) && multiline || property.isSpreadElement() && (couple || multiline))
+        if (isNewlineAfterProperty(property, {multiline}))
             print.newline();
         
-        if (!isSpreadElement(property) && !hasNextLeadingComment(property) && isNewlineBetweenSiblings(property))
+        if (isLinebreakAfterProperty(property))
             print.linebreak();
     }
     

package/package.json

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