@putout/printer 5.37.0 → 5.39.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.10.25, v5.39.0
+
+feature:
+- e02cb0e JSXExpression: improve support
+- 1dc666f @putout/printer: ArrowFunctionExpression: space
+
+2023.10.25, v5.38.0
+
+feature:
+- 983412b comments: leading: improve
+
 2023.10.24, v5.37.0
 
 feature:

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

@@ -66,7 +66,6 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
             const looksLikeDirective = path.isDirective();
             const looksLikeProp = path.isObjectProperty();
             
-            // || path.isTSPropertySignature();
             if (looksLikeProp)
                 print.breakline();
             

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

@@ -1,7 +1,11 @@
 'use strict';
 
 const {isDecorator} = require('@putout/babel').types;
-const {isLast, isCoupleLines} = require('../is');
+const {
+    isLast,
+    isCoupleLines,
+    isNext,
+} = require('../is');
 
 const hasBody = (path) => path.node.body;
 
@@ -30,7 +34,7 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
             
             if (hasBody(path)) {
                 write.breakline();
-                write.breakline();
+                maybe.write.breakline(!isNext(path));
             }
             
             write(`//${value}`);

package/lib/tokenize/expressions/function/arrow-function-expression.js

@@ -30,10 +30,9 @@ module.exports.ArrowFunctionExpression = maybeParens((path, printer, semantics)
     
     const body = path.get('body');
     
-    const insideCall = path.parentPath.isCallExpression();
     const isJSX = body.isJSXElement();
     
-    maybe.print.space(!insideCall && isJSX);
     maybe.print.space(!isJSX);
+    
     print('__body');
 });

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

@@ -1,21 +1,28 @@
 'use strict';
 
+const {isJSXElement} = require('@putout/babel').types;
+
+const isInsideArrow = ({parentPath}) => parentPath.isArrowFunctionExpression();
+
 module.exports.JSXElement = {
     condition,
-    before(path, {write, indent}) {
-        write('(');
+    before(path, {write, indent, maybe}) {
+        const {leadingComments} = path.node;
+        
+        maybe.write.space(!leadingComments && isInsideArrow(path));
         indent.inc();
-        write.breakline();
+        
+        if (!leadingComments) {
+            write('(');
+            write.newline();
+        }
     },
-    print(path, {print, traverse, indent, maybe}) {
+    print(path, {print, traverse, indent}) {
         const insideFn = path.parentPath.isArrowFunctionExpression();
         const insideCall = path.parentPath.parentPath.isCallExpression();
         
-        if (insideFn && insideCall) {
-            indent.inc();
+        if (insideFn && insideCall)
             indent.inc();
-            indent();
-        }
         
         print('__openingElement');
         path
@@ -24,16 +31,22 @@ module.exports.JSXElement = {
         
         print('__closingElement');
         
-        if (insideFn && insideCall) {
+        if (insideFn && insideCall)
             indent.dec();
-            maybe.print.breakline(insideCall);
+    },
+    after(path, {write, indent, maybe}) {
+        const {leadingComments} = path.node;
+        const isJSX = isJSXElement(path.parentPath.parentPath?.parentPath?.parentPath);
+        
+        if (isJSX) {
+            write.breakline();
             indent.dec();
+        } else {
+            indent.dec();
+            write.breakline();
         }
-    },
-    after(path, {write, indent}) {
-        indent.dec();
-        write.breakline();
-        write(')');
+        
+        maybe.write(!leadingComments, ')');
     },
 };
 
@@ -44,5 +57,8 @@ function condition(path) {
     if (path.node.extra?.parenthesized)
         return true;
     
+    if (path.parentPath.isArrowFunctionExpression())
+        return true;
+    
     return path.parentPath.isVariableDeclarator();
 }

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

@@ -2,8 +2,19 @@
 
 const {isCoupleLines} = require('../is');
 
+const isNotJSX = ({parentPath}) => {
+    if (parentPath.parentPath.isJSXElement())
+        return false;
+    
+    if (parentPath.parentPath.isJSXExpressionContainer())
+        return false;
+    
+    return !parentPath.parentPath.isJSXFragment();
+};
+
 module.exports.JSXOpeningElement = {
     print(path, {print, maybe}) {
+        maybe.indent(isNotJSX(path));
         print('<');
         print('__name');
         

package/lib/tokenize/typescript/index.js

@@ -34,6 +34,7 @@ const {
     maybeParenOpen,
     maybeParenClose,
 } = require('../expressions/unary-expression/parens');
+
 const {maybePrintTypeAnnotation} = require('../maybe/maybe-type-annotation');
 
 module.exports = {

package/package.json

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