@putout/printer 15.18.2 → 15.20.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.08.12, v15.20.0
+
+feature:
+- 0eb1ddd @putout/printer: JSXText: no extra
+
+2025.08.05, v15.19.0
+
+feature:
+- f518cd6 @putout/printer: SequenceExpression: leadingComments inside AssignmentExpressions: improve
+
 2025.08.05, v15.18.2
 
 feature:

package/lib/tokenize/expressions/assignment-expression/assignment-expression-comments.js

@@ -4,7 +4,19 @@ const {types} = require('@putout/babel');
 const {hasLeadingComment} = require('#is');
 const {isReturnStatement} = types;
 
-module.exports.printLeadingCommentLine = (path, printer, semantics, {printComment}) => {
+module.exports.printLeadingCommentLine = (path, printer, semantics, {printComment, isLast}) => {
+    const {parentPath} = path;
+    const {print, maybe} = printer;
+    
+    if (isReturnStatement(parentPath))
+        return;
+    
+    maybe.print.breakline(!isLast);
+    printComment();
+    print.breakline();
+};
+
+module.exports.printLeadingCommentBlock = (path, printer, semantics, {printComment}) => {
     const {parentPath} = path;
     const {print} = printer;
     
@@ -12,7 +24,7 @@ module.exports.printLeadingCommentLine = (path, printer, semantics, {printCommen
         return;
     
     printComment();
-    print.newline();
+    print.indent();
 };
 
 module.exports.maybeInsideReturnWithCommentStart = (path, {print, indent}) => {

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

@@ -6,6 +6,7 @@ const {
     printLeadingCommentLine,
     maybeInsideReturnWithCommentEnd,
     maybeInsideReturnWithCommentStart,
+    printLeadingCommentBlock,
 } = require('./assignment-expression-comments');
 
 const {maybeParens} = require('../../maybe/maybe-parens');
@@ -38,3 +39,4 @@ module.exports.AssignmentExpression = maybeParens({
 });
 
 module.exports.AssignmentExpression.printLeadingCommentLine = printLeadingCommentLine;
+module.exports.AssignmentExpression.printLeadingCommentBlock = printLeadingCommentBlock;

package/lib/tokenize/expressions/sequence-expression/maybe-write-brace.js

@@ -1,40 +1,18 @@
 'use strict';
 
-module.exports.maybeWriteLeftBrace = (path, printer, semantics) => {
-    maybeWriteBrace(path, printer, semantics, {
-        brace: '(',
-    });
-};
-
-module.exports.maybeWriteRightBrace = (path, printer, semantics) => {
-    maybeWriteBrace(path, printer, semantics, {
-        brace: ')',
-    });
-};
-
-function maybeWriteBrace(path, printer, semantics, {brace}) {
+module.exports.condition = (path, printer, semantics) => {
     const {parentPath} = path;
     const {type} = parentPath;
     const {roundBraces} = semantics;
-    const {write} = printer;
-    
-    if (type === 'ArrowFunctionExpression') {
-        write(brace);
-        return;
-    }
     
-    if (type === 'ConditionalExpression' && path !== parentPath.get('test')) {
-        write(brace);
-        return;
-    }
+    if (type === 'ArrowFunctionExpression')
+        return true;
     
-    if (type === 'LogicalExpression') {
-        write(brace);
-        return;
-    }
+    if (type === 'ConditionalExpression' && path !== parentPath.get('test'))
+        return true;
     
-    if (!roundBraces.sequence)
-        return;
+    if (type === 'LogicalExpression')
+        return true;
     
-    write(brace);
-}
+    return roundBraces.sequence;
+};

package/lib/tokenize/expressions/sequence-expression/sequence-expression-comments.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const {hasLeadingComment} = require('#is');
+const noop = () => {};
+
+module.exports.printLeadingCommentLine = noop;
+module.exports.printLeadingCommentBlock = noop;
+
+module.exports.maybePrintComments = (path, {print}) => {
+    if (hasLeadingComment(path)) {
+        const {leadingComments} = path.node;
+        
+        for (const {type, value} of leadingComments) {
+            if (type === 'CommentLine')
+                print(`//${value}`);
+            else
+                print(`/*${value}*/`);
+            
+            print.breakline();
+        }
+    }
+};

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

@@ -1,23 +1,53 @@
 'use strict';
 
+const {hasLeadingComment} = require('#is');
+const {maybeParens} = require('../../maybe/maybe-parens');
+const {condition} = require('./maybe-write-brace');
+
 const {
-    maybeWriteLeftBrace,
-    maybeWriteRightBrace,
-} = require('./maybe-write-brace');
+    maybePrintComments,
+    printLeadingCommentLine,
+    printLeadingCommentBlock,
+} = require('./sequence-expression-comments');
+
+module.exports.SequenceExpression = maybeParens({
+    checkParens: false,
+    condition,
+    print(path, printer) {
+        const {
+            write,
+            traverse,
+            indent,
+            maybe,
+        } = printer;
+        
+        const expressions = path.get('expressions');
+        const n = expressions.length - 1;
+        
+        const withComment = hasLeadingComment(path);
+        
+        if (withComment) {
+            indent.inc();
+            write.breakline();
+            maybePrintComments(path, printer);
+        }
+        
+        for (const [index, expression] of expressions.entries()) {
+            traverse(expression);
+            
+            if (index < n) {
+                write(',');
+                maybe.write.space(!withComment);
+                maybe.print.breakline(withComment);
+            }
+        }
+        
+        if (withComment) {
+            indent.dec();
+            write.breakline();
+        }
+    },
+});
 
-module.exports.SequenceExpression = (path, printer, semantics) => {
-    const {maybe, traverse} = printer;
-    
-    const expressions = path.get('expressions');
-    const n = expressions.length - 1;
-    
-    maybeWriteLeftBrace(path, printer, semantics);
-    
-    for (const [index, expression] of expressions.entries()) {
-        traverse(expression);
-        maybe.write(index < n, ',');
-        maybe.write.space(index < n);
-    }
-    
-    maybeWriteRightBrace(path, printer, semantics);
-};
+module.exports.SequenceExpression.printLeadingCommentLine = printLeadingCommentLine;
+module.exports.SequenceExpression.printLeadingCommentBlock = printLeadingCommentBlock;

package/lib/tokenize/jsx/index.js

@@ -5,7 +5,7 @@ const {JSXAttribute} = require('./jsx-attribute');
 const {isCoupleLines} = require('../is');
 const {JSXOpeningElement} = require('./jsx-opening-element');
 const fragments = require('./jsx-fragment');
-const {JSXText} = require('./jsx-text');
+const {JSXText} = require('./jsx-text/jsx-text');
 const {parseComments} = require('../comment/comment');
 
 module.exports = {

package/lib/tokenize/jsx/{jsx-text.js → jsx-text/jsx-text.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isNext} = require('../is');
+const {isNext} = require('#is');
 
 module.exports.JSXText = (path, {write, indent}) => {
     const {node} = path;
@@ -8,7 +8,7 @@ module.exports.JSXText = (path, {write, indent}) => {
     const isSpacesOnly = /^\s+$/.test(value);
     const hasNext = isNext(path);
     
-    if (extra.raw.includes('&'))
+    if (extra?.raw.includes('&'))
         return write(extra.raw);
     
     if (isSpacesOnly && hasNext) {

package/package.json

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