@putout/printer 1.56.0 → 1.58.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.19, v1.58.0
+
+feature:
+- da02030 @putout/printer: improve support of comments inside JSX
+
+2023.04.19, v1.57.0
+
+feature:
+- 8f4ddc4 @putout/printer: add support of JSXMemberExpression
+
 2023.04.19, v1.56.0
 
 feature:

package/lib/tokenize/comments.js

@@ -10,12 +10,19 @@ module.exports.parseLeadingComments = (path, {print, maybe}) => {
     if (!leadingComments || !leadingComments.length)
         return;
     
-    const isClass = !path.isClassMethod();
+    const insideFn = path.parentPath.isFunction();
+    const isIndent = !path.isClassMethod() && !insideFn;
     
     for (const {type, value} of leadingComments) {
-        maybe.indent(isClass);
+        maybe.indent(isIndent);
         
         if (type === 'CommentLine') {
+            maybe.indent.inc(insideFn);
+            maybe.indent.inc(insideFn);
+            maybe.print.breakline(insideFn);
+            maybe.indent.dec(insideFn);
+            maybe.indent.dec(insideFn);
+            
             print(`//${value}`);
             print.newline();
             

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

@@ -51,6 +51,7 @@ function CallExpression(path, {indent, print, maybe, traverse}) {
     
     print(')');
 }
+
 module.exports.OptionalCallExpression = CallExpression;
 module.exports.CallExpression = CallExpression;
 

package/lib/tokenize/expressions/class.js

@@ -1,18 +1,25 @@
 'use strict';
 
+const {isNext} = require('../is');
+
 module.exports.ClassExpression = classVisitor;
 module.exports.ClassDeclaration = classVisitor;
 
-module.exports.ClassDeclaration = (path, {print, indent}) => {
+module.exports.ClassDeclaration = (path, {print, indent, maybe, write}) => {
     indent();
     
     classVisitor(path, {
         print,
         indent,
+        maybe,
     });
+    
+    if (!path.parentPath.isExportDeclaration() && isNext(path)) {
+        write.newline();
+    }
 };
 
-function classVisitor(path, {print, indent}) {
+function classVisitor(path, {print, indent, maybe}) {
     print('class ');
     print('__id');
     print('__typeParameters');
@@ -25,6 +32,7 @@ function classVisitor(path, {print, indent}) {
     }
     
     if (node.superClass) {
+        maybe.print.space(path.node.id);
         print('extends ');
         print('__superClass');
     }

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

@@ -37,7 +37,14 @@ module.exports.ArrowFunctionExpression = {
         
         print.space();
         print('=>');
-        print.space();
+        
+        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');
     },
     after(path, {write}) {

package/lib/tokenize/expressions/functions/function-declaration.js

@@ -2,8 +2,20 @@
 
 const {markAfter} = require('../../mark');
 const {isNext} = require('../../is');
+const isFirst = (path) => !path.getPrevSibling().node;
 
 module.exports.FunctionDeclaration = {
+    beforeIf(path) {
+        if (isFirst(path))
+            return false;
+        
+        const prev = path.getPrevSibling();
+        
+        return prev.isClassDeclaration();
+    },
+    before(path, {write}) {
+        write.newline();
+    },
     print(path, {print, maybe}) {
         const {async} = path.node;
         

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

@@ -62,6 +62,7 @@ function shouldAddNewline(path) {
     
     return path.parentPath.parentPath.isSpreadElement();
 }
+
 module.exports.ObjectProperty = (path, {print, maybe}) => {
     const {
         shorthand,

package/lib/tokenize/expressions/unary-expressions.js

@@ -30,6 +30,7 @@ function printUnary(path, name, {print}) {
     print(`${name} `);
     print('__argument');
 }
+
 const isWord = (a) => /delete|typeof/.test(a);
 
 function unaryExpression(path, {maybe, traverse}) {

package/lib/tokenize/is.js

@@ -45,6 +45,7 @@ function isCoupleLines(path) {
     
     return end > start;
 }
+
 module.exports.exists = (a) => a.node;
 module.exports.isStringAndIdentifier = ([a, b]) => isStringLiteral(a) && isIdentifier(b);
 

package/lib/tokenize/jsx/index.js

@@ -22,6 +22,11 @@ module.exports = {
     JSXText(path, {write}) {
         write(path.node.value);
     },
+    JSXMemberExpression(path, {print}) {
+        print('__object');
+        print('.');
+        print('__property');
+    },
     JSXSpreadAttribute(path, {print, maybe}) {
         const isNewline = isCoupleLines(path.parentPath);
         maybe.indent.inc(isNewline);

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

@@ -7,10 +7,25 @@ module.exports.JSXElement = {
         indent.inc();
         write.breakline();
     },
-    print(path, {print, traverse}) {
+    print(path, {print, traverse, indent, maybe}) {
+        const insideFn = path.parentPath.isArrowFunctionExpression();
+        const insideCall = path.parentPath.parentPath.isCallExpression();
+        
+        if (insideFn && insideCall) {
+            indent.inc();
+            indent.inc();
+            indent();
+        }
+        
         print('__openingElement');
         path.get('children').map(traverse);
         print('__closingElement');
+        
+        if (insideFn && insideCall) {
+            indent.dec();
+            maybe.print.breakline(insideCall);
+            indent.dec();
+        }
     },
     after(path, {write, indent}) {
         indent.dec();

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

@@ -2,27 +2,29 @@
 
 const {isCoupleLines} = require('../is');
 
-module.exports.JSXOpeningElement = (path, {print, maybe}) => {
-    print('<');
-    print('__name');
-    
-    const coupleLines = isCoupleLines(path);
-    const noCoupleLines = !coupleLines;
-    const shouldIndent = coupleLines && path.parentPath.parentPath.isJSXElement();
-    
-    maybe.indent.inc(shouldIndent);
-    
-    for (const attr of path.get('attributes')) {
-        maybe.print.space(noCoupleLines);
-        print(attr);
-    }
-    
-    if (isCoupleLines(path))
-        print.breakline();
-    
-    if (path.node.selfClosing)
-        print('/');
-    
-    print('>');
-    maybe.indent.dec(shouldIndent);
+module.exports.JSXOpeningElement = {
+    print(path, {print, maybe}) {
+        print('<');
+        print('__name');
+        
+        const coupleLines = isCoupleLines(path);
+        const noCoupleLines = !coupleLines;
+        const shouldIndent = coupleLines && path.parentPath.parentPath.isJSXElement();
+        
+        maybe.indent.inc(shouldIndent);
+        
+        for (const attr of path.get('attributes')) {
+            maybe.print.space(noCoupleLines);
+            print(attr);
+        }
+        
+        if (isCoupleLines(path))
+            print.breakline();
+        
+        if (path.node.selfClosing)
+            print('/');
+        
+        print('>');
+        maybe.indent.dec(shouldIndent);
+    },
 };

package/lib/tokenize/mark.js

@@ -14,11 +14,13 @@ function markBefore(path) {
 function markAfter(path) {
     path[WATER_MARK_AFTER] = true;
 }
+
 module.exports.isMarkedAfter = isMarkedAfter;
 
 function isMarkedAfter(path) {
     return path[WATER_MARK_AFTER];
 }
+
 module.exports.hasPrevNewline = (path) => {
     return isMarkedAfter(path.getPrevSibling());
 };

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

@@ -89,6 +89,7 @@ function isNextCoupleLines(path) {
     
     return isCoupleLines(next);
 }
+
 const isLast = (path) => path.parentPath?.isProgram() && !isNext(path);
 
 function shouldAddNewlineBefore(path) {
@@ -115,6 +116,7 @@ function shouldAddNewlineBefore(path) {
 function isFirst(path) {
     return path.node === path.parentPath.node.body?.[0];
 }
+
 const isNextAssign = (path) => {
     const nextPath = path.getNextSibling();
     

package/lib/tokenize/tokenize.js

@@ -52,6 +52,7 @@ function initFormat(format) {
         indent: '    ',
     };
 }
+
 const createAddToken = (tokens) => {
     const log = createLog();
     
@@ -237,6 +238,7 @@ function printIndent(i, indent) {
     
     return result;
 }
+
 const createPrint = (path, {traverse, write}) => (maybeLine) => {
     if (maybeLine === path)
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.56.0",
+  "version": "1.58.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",