@putout/printer 5.32.0 → 5.34.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.10.24, v5.34.0
+
+feature:
+- 66a867a @putout/printer: comments: improve
+
+2023.10.24, v5.33.0
+
+feature:
+- 8bd4d6c @putout/printer: JSXText: raw
+
 2023.10.24, v5.32.0
 
 feature:

package/lib/tokenize/comment/parse-comments.js

@@ -1,6 +1,8 @@
 'use strict';
 
-module.exports.parseComments = (path, {write}, semantics) => {
+const {isNext} = require('../is');
+
+module.exports.parseComments = (path, {write, maybe}, semantics) => {
     if (!semantics.comments)
         return;
     
@@ -9,11 +11,20 @@ module.exports.parseComments = (path, {write}, semantics) => {
     if (!comments)
         return;
     
-    for (const {type, value} of comments) {
+    const n = comments.length - 1;
+    const program = path.isProgram();
+    
+    for (const [i, {type, value}] of comments.entries()) {
         if (type === 'CommentLine') {
-            write.breakline();
+            maybe.write.breakline(isNext(path) || !program);
             write('//');
             write(value);
+            
+            if (program) {
+                maybe.write.newline(i < n);
+                continue;
+            }
+            
             write.newline();
             continue;
         }

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

@@ -31,8 +31,14 @@ const isMemberExpressionCallee = ({parentPath}) => {
     return likeChain(callee);
 };
 
-module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantics) => {
+module.exports.ObjectExpression = (path, printer, semantics) => {
     const {trailingComma} = semantics;
+    const {
+        print,
+        maybe,
+        indent,
+    } = printer;
+    
     indent.inc();
     
     const properties = path.get('properties');
@@ -42,7 +48,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantic
     
     maybe.print(parens, '(');
     print('{');
-    parseComments(path, {write}, semantics);
+    parseComments(path, printer, semantics);
     maybe.print.newline(manyLines);
     
     const n = properties.length - 1;

package/lib/tokenize/jsx/jsx-element.js

@@ -21,6 +21,7 @@ module.exports.JSXElement = {
         path
             .get('children')
             .map(traverse);
+        
         print('__closingElement');
         
         if (insideFn && insideCall) {
@@ -40,5 +41,8 @@ function condition(path) {
     if (path.parentPath.isReturnStatement())
         return true;
     
+    if (path.node.extra?.parenthesized)
+        return true;
+    
     return path.parentPath.isVariableDeclarator();
 }

package/lib/tokenize/jsx/jsx-text.js

@@ -3,10 +3,14 @@
 const {isNext} = require('../is');
 
 module.exports.JSXText = (path, {write, indent}) => {
-    const {value} = path.node;
+    const {node} = path;
+    const {value, extra} = node;
     const isSpacesOnly = /^\s+$/.test(value);
     const hasNext = isNext(path);
     
+    if (extra?.raw.startsWith('&'))
+        return write(extra.raw);
+    
     if (isSpacesOnly && hasNext) {
         indent.inc();
         write.breakline();
@@ -17,7 +21,6 @@ module.exports.JSXText = (path, {write, indent}) => {
     
     if (isSpacesOnly) {
         write.breakline();
-        
         return;
     }
     

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

@@ -29,7 +29,13 @@ const parentIfWithoutElse = ({parentPath}) => {
 };
 
 module.exports.BlockStatement = {
-    print(path, {indent, maybe, write, traverse}, semantics) {
+    print(path, printer, semantics) {
+        const {
+            indent,
+            maybe,
+            write,
+            traverse,
+        } = printer;
         const body = path.get('body');
         const directives = getDirectives(path);
         
@@ -50,7 +56,7 @@ module.exports.BlockStatement = {
             traverse(element);
         }
         
-        parseComments(path, {write}, semantics);
+        parseComments(path, printer, semantics);
         
         indent.dec();
         maybe.indent(body.length);

package/lib/tokenize/statements/program/program.js

@@ -3,10 +3,16 @@
 const {parseComments} = require('../../comment/comment');
 const {getDirectives} = require('../block-statement/get-directives');
 
-module.exports.Program = (path, {print, write, traverse, maybe}, semantics) => {
+module.exports.Program = (path, printer, semantics) => {
     const {body} = path.node;
+    const {
+        print,
+        traverse,
+        maybe,
+    } = printer;
+    
     print('__interpreter');
-    parseComments(path, {write}, semantics);
+    parseComments(path, printer, semantics);
     
     const directives = getDirectives(path);
     

package/package.json

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