@putout/printer 18.3.6 → 18.4.1

package/ChangeLog

@@ -1,3 +1,20 @@
+2026.03.10, v18.4.1
+
+feature:
+- 4f2fb23 @putout/printer: is-concatenation
+- 9c1917c @putout/printer: BinaryExpression: concatenate: simplify
+- a8f5542 @putout/printer: ObjectExpression: ObjectProperty: isSpaceAfterComma
+- e79a33c @putout/printer: ObjectExpression: ObjectProperty: space
+- d206ffa @putout/printer: ObjectProperty: isCommaAfterProperty
+
+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/binary-expression/binary-expression.js

@@ -1,8 +1,6 @@
 import {maybeParens} from '#maybe-parens';
-import {
-    concatenate,
-    isConcatenation,
-} from './concatenate.js';
+import {isConcatenation} from '#is-concatenation';
+import {concatenate} from './concatenate.js';
 import {maybeSpace} from './maybe-space.js';
 
 export const BinaryExpression = maybeParens((path, {print, indent, maybe}) => {

package/lib/tokenize/expressions/binary-expression/concatenate.js

@@ -1,52 +1,9 @@
-import {types} from '@putout/babel';
+import {maybeInsideBinary} from './maybe-inside-binary.js';
 
-const {
-    isStringLiteral,
-    isTemplateLiteral,
-    isBinaryExpression,
-} = types;
-
-const isStringLike = (a) => {
-    if (isStringLiteral(a))
-        return true;
-    
-    return isTemplateLiteral(a);
-};
-
-export const isConcatenation = (path) => {
-    const {parentPath} = path;
-    const {operator} = path.node;
-    
-    if (operator !== '+')
-        return false;
-    
-    const startLine = path.node.loc?.start.line;
-    const endLine = path.node.loc?.end.line;
-    
-    if (startLine === endLine)
-        return false;
-    
-    const left = path.get('left');
-    const right = path.get('right');
-    
-    if (isStringLike(left) && isStringLike(right) && isBinaryExpression(parentPath))
-        return true;
-    
-    return isBinaryExpression(left) && isStringLike(right);
-};
-
-export const concatenate = (path, {print, indent}) => {
-    if (!path.parentPath.isBinaryExpression()) {
-        indent.inc();
-        print.breakline();
-    }
-    
+export const concatenate = maybeInsideBinary((path, {print}) => {
     print('__left');
     print.space();
     print('+');
     print.breakline();
     print('__right');
-    
-    if (!path.parentPath.isBinaryExpression())
-        indent.dec();
-};
+});

package/lib/tokenize/expressions/binary-expression/is-contatenation.js

@@ -0,0 +1,16 @@
+import {types} from '@putout/babel';
+import {createTypeChecker} from '#type-checker';
+
+const {isBinaryExpression} = types;
+
+export const isConcatenation = createTypeChecker([
+    ['-: node.loc', isSameLine],
+    ['+', isBinaryExpression],
+]);
+
+function isSameLine(loc) {
+    const startLine = loc?.start.line;
+    const endLine = loc?.end.line;
+    
+    return startLine === endLine;
+}

package/lib/tokenize/expressions/binary-expression/maybe-inside-binary.js

@@ -0,0 +1,20 @@
+import {types} from '@putout/babel';
+
+const {isBinaryExpression} = types;
+const isInsideBinary = ({parentPath}) => isBinaryExpression(parentPath);
+
+export const maybeInsideBinary = (fn) => (path, printer, semantics) => {
+    const {indent, print} = printer;
+    const insideBinary = isInsideBinary(path);
+    
+    if (!insideBinary) {
+        indent.inc();
+        print.breakline();
+    }
+    
+    fn(path, printer, semantics);
+    
+    if (!insideBinary)
+        indent.dec();
+};
+

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

@@ -4,21 +4,15 @@ 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([
+export const isCommaAfterProperty = createTypeChecker([
     ['+: -> !', isLastProperty],
+    ['-: -> !', isMultilineOption],
     ['+', isTrailingCommaOption],
 ]);
 
-export const isCommaAfterProperty = createTypeChecker([
+export const isCommaAfterSpread = createTypeChecker([
     ['-: -> !SpreadElement'],
-    ['-: -> !', isCoupleOrManyLines],
-    ['+', isLastOrTrailingComma],
+    ['+', isCommaAfterProperty],
 ]);

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,21 +4,19 @@ import {
     isCoupleLines,
     isForOf,
     isIf,
-    isNewlineBetweenSiblings,
     hasLeadingComment,
     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 {isCommaAfterSpread} 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([
@@ -65,10 +60,10 @@ const isInsideTupleLike = createTypeChecker([
 export const isMultiline = createTypeChecker([
     ['-', hasNoProperties],
     ['-: parentPath -> ForOfStatement'],
-    ['+: node.properties.0 -> SpreadElement'],
     ['-', notLastArgInsideCall],
     ['-', isForOf],
     ['-', isIf],
+    ['+: node.properties.0 -> SpreadElement'],
     ['+', isCoupleLines],
     ['+', hasValue],
 ]);
@@ -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();
         
@@ -117,15 +110,15 @@ export const ObjectExpression = (path, printer, semantics) => {
         if (hasTrailingComment(property))
             continue;
         
-        maybe.print(isCommaAfterProperty(property, {
+        maybe.print(isCommaAfterSpread(property, {
             multiline,
             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/lib/tokenize/expressions/object-expression/object-property.js

@@ -1,6 +1,8 @@
-import {isConcatenation} from '../binary-expression/concatenate.js';
+import {isConcatenation} from '#is-concatenation';
 import {isMultiline} from './object-expression.js';
 import {printKey} from './print-key.js';
+import {isCommaAfterProperty} from './comma.js';
+import {isSpaceAfterComma} from './space.js';
 
 export const ObjectProperty = (path, printer, semantics) => {
     const {trailingComma} = semantics;
@@ -12,8 +14,6 @@ export const ObjectProperty = (path, printer, semantics) => {
     } = printer;
     
     const value = path.get('value');
-    const properties = path.parentPath.get('properties');
-    const isLast = path === properties.at(-1);
     const multiline = isMultiline(path.parentPath);
     
     printKey(path, printer);
@@ -24,11 +24,9 @@ export const ObjectProperty = (path, printer, semantics) => {
         traverse(value);
     }
     
-    if (multiline) {
-        maybe.write(!isLast || trailingComma, ',');
-        return;
-    }
+    if (isCommaAfterProperty(path, {multiline, trailingComma}))
+        write(',');
     
-    if (!isLast && properties.length)
-        write(', ');
+    if (isSpaceAfterComma(path, {multiline}))
+        write.space();
 };

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

@@ -0,0 +1,9 @@
+import {createTypeChecker} from '#type-checker';
+import {isMultilineOption} from '../array-expression/is.js';
+
+const isLast = ({node, parentPath}) => node === parentPath.node.properties.at(-1);
+
+export const isSpaceAfterComma = createTypeChecker([
+    ['-', isMultilineOption],
+    ['+: -> !', isLast],
+]);

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

@@ -1,6 +1,7 @@
 import {types} from '@putout/babel';
 import {hasPrevNewline} from '#mark';
 import {createTypeChecker} from '#type-checker';
+import {isConcatenation} from '#is-concatenation';
 import {
     isNext,
     isCoupleLines,
@@ -17,7 +18,6 @@ import {
     callWithParent,
 } from '#is';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
-import {isConcatenation} from '../../expressions/binary-expression/concatenate.js';
 import {parseLeadingComments} from '../../comment/comment.js';
 import {maybeDeclare} from '../../maybe/maybe-declare.js';
 

package/package.json

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