@putout/printer 5.42.0 → 5.44.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.10.26, v5.44.0
+
+feature:
+- b9e05b0 @putout/printer: JSX: improve handling return with comment
+
+2023.10.25, v5.43.0
+
+feature:
+- 743122f JSX: newlines
+
 2023.10.25, v5.42.0
 
 feature:

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

@@ -9,7 +9,10 @@ const isNotJSX = ({parentPath}) => {
     if (parentPath.parentPath.isJSXExpressionContainer())
         return false;
     
-    return !parentPath.parentPath.isJSXFragment();
+    if (parentPath.parentPath.isJSXFragment())
+        return false;
+    
+    return !parentPath.parentPath.isLogicalExpression();
 };
 
 module.exports.JSXOpeningElement = {

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

@@ -10,6 +10,8 @@ const {
 const {
     isArrowFunctionExpression,
     isObjectMethod,
+    isFunctionDeclaration,
+    isExportDeclaration,
 } = require('@putout/babel').types;
 
 const {markAfter} = require('../../mark');
@@ -103,9 +105,23 @@ function shouldAddNewlineAfter(path) {
     if (isLast(path))
         return false;
     
+    if (isExportFunction(path))
+        return false;
+    
     return !isNextIfAlternate(path);
 }
 
+// export function a() {}
+function isExportFunction(path) {
+    if (!isFunctionDeclaration(path.parentPath))
+        return false;
+    
+    if (!isExportDeclaration(path.parentPath?.parentPath))
+        return false;
+    
+    return !isNext(path.parentPath?.parentPath);
+}
+
 function isNextIfAlternate(path) {
     const {parentPath} = path;
     

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

@@ -86,7 +86,6 @@ module.exports.ExportNamedDeclaration = {
             indent.dec();
             indent();
             write('}');
-            
             const source = path.get('source');
             
             if (exists(source)) {

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

@@ -1,5 +1,7 @@
 'use strict';
 
+const {isJSXElement} = require('@putout/babel').types;
+
 const {
     isPrevBody,
     noTrailingComment,
@@ -24,6 +26,16 @@ module.exports.ReturnStatement = {
         maybeSpaceAfterKeyword(path, {
             print,
         });
+        
+        if (isJSXWithComment(path)) {
+            print('(');
+            print.breakline();
+            print('__argument');
+            print(');');
+            
+            return;
+        }
+        
         print('__argument');
         print(';');
     },
@@ -37,3 +49,13 @@ module.exports.ReturnStatement = {
         print.newline();
     },
 };
+function isJSXWithComment(path) {
+    const arg = path.node.argument;
+    
+    if (!arg)
+        return;
+    
+    const {leadingComments} = arg;
+    
+    return isJSXElement(arg) && leadingComments?.length;
+}

package/package.json

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