@putout/printer 1.55.0 → 1.57.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.19, v1.57.0
+
+feature:
+- 8f4ddc4 @putout/printer: add support of JSXMemberExpression
+
+2023.04.19, v1.56.0
+
+feature:
+- aaf4886 @putout/printer: add support of JSXFragment
+
 2023.04.18, v1.55.0
 
 fix:

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

@@ -3,16 +3,17 @@
 module.exports.ClassExpression = classVisitor;
 module.exports.ClassDeclaration = classVisitor;
 
-module.exports.ClassDeclaration = (path, {print, indent}) => {
+module.exports.ClassDeclaration = (path, {print, indent, maybe}) => {
     indent();
     
     classVisitor(path, {
         print,
         indent,
+        maybe,
     });
 };
 
-function classVisitor(path, {print, indent}) {
+function classVisitor(path, {print, indent, maybe}) {
     print('class ');
     print('__id');
     print('__typeParameters');
@@ -25,6 +26,7 @@ function classVisitor(path, {print, indent}) {
     }
     
     if (node.superClass) {
+        maybe.print.space(path.node.id);
         print('extends ');
         print('__superClass');
     }

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

@@ -1,15 +1,9 @@
 'use strict';
 
-const {hasPrevNewline} = require('../../mark');
-const isFirst = (path) => !path.getPrevSibling().node;
+const {markAfter} = require('../../mark');
+const {isNext} = require('../../is');
 
 module.exports.FunctionDeclaration = {
-    beforeIf(path) {
-        return !isFirst(path) && !hasPrevNewline(path) && !path.parentPath.isExportDeclaration();
-    },
-    before(path, {write}) {
-        write('\n');
-    },
     print(path, {print, maybe}) {
         const {async} = path.node;
         
@@ -32,4 +26,11 @@ module.exports.FunctionDeclaration = {
         print(') ');
         print('__body');
     },
+    afterSatisfy: () => [
+        isNext,
+    ],
+    after(path, {write}) {
+        write.newline();
+        markAfter(path);
+    },
 };

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

@@ -4,8 +4,10 @@ const {JSXElement} = require('./jsx-element');
 const {JSXAttribute} = require('./jsx-attribute');
 const {isCoupleLines} = require('../is');
 const {JSXOpeningElement} = require('./jsx-opening-element');
+const fragments = require('./jsx-fragment');
 
 module.exports = {
+    ...fragments,
     JSXElement,
     JSXAttribute,
     JSXOpeningElement,
@@ -20,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-fragment.js

@@ -0,0 +1,35 @@
+'use strict';
+
+module.exports.JSXFragment = {
+    condition,
+    before(path, {write, indent}) {
+        write('(');
+        indent.inc();
+        write.breakline();
+    },
+    print(path, {print, traverse}) {
+        print('__openingFragment');
+        path.get('children').map(traverse);
+        print('__closingFragment');
+    },
+    after(path, {write, indent}) {
+        indent.dec();
+        write.breakline();
+        write(')');
+    },
+};
+
+module.exports.JSXOpeningFragment = (path, {write}) => {
+    write('<>');
+};
+
+module.exports.JSXClosingFragment = (path, {write}) => {
+    write('</>');
+};
+
+function condition(path) {
+    if (path.parentPath.isReturnStatement())
+        return true;
+    
+    return path.parentPath.isVariableDeclarator();
+}

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/export-default-declaration.js

@@ -1,11 +1,6 @@
 'use strict';
 
-const {
-    isNewlineBetweenStatements,
-    isNext,
-} = require('../is');
-
-const {isMarkedAfter} = require('../mark');
+const {isNext} = require('../is');
 
 const notClass = (path) => {
     if (!isNext(path))
@@ -15,17 +10,6 @@ const notClass = (path) => {
 };
 
 module.exports.ExportDefaultDeclaration = {
-    beforeIf(path) {
-        const prev = path.getPrevSibling();
-        
-        if (isMarkedAfter(prev))
-            return false;
-        
-        return isNewlineBetweenStatements(prev);
-    },
-    before(path, {print}) {
-        print.newline();
-    },
     print(path, {print, traverse, maybe}) {
         const declaration = path.get('declaration');
         print('export default ');

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.55.0",
+  "version": "1.57.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",