@putout/printer 1.61.0 → 1.62.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.20, v1.62.0
+
+feature:
+- 7cebd86 @putout/printer: improve support of JSXText
+
+2023.04.20, v1.61.1
+
+feature:
+- 69575cb @putout/printer: newlines
+
 2023.04.20, v1.61.0
 
 feature:

package/lib/tokenize/expressions/class.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {isNext} = require('../is');
+const {markAfter} = require('../mark');
 
 module.exports.ClassExpression = classVisitor;
 module.exports.ClassDeclaration = classVisitor;
@@ -16,6 +17,8 @@ module.exports.ClassDeclaration = (path, {print, indent, maybe, write}) => {
     
     if (!path.parentPath.isExportDeclaration() && isNext(path)) {
         write.newline();
+        write.newline();
+        markAfter(path);
     }
 };
 

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

@@ -2,20 +2,8 @@
 
 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/jsx/index.js

@@ -5,12 +5,14 @@ const {JSXAttribute} = require('./jsx-attribute');
 const {isCoupleLines} = require('../is');
 const {JSXOpeningElement} = require('./jsx-opening-element');
 const fragments = require('./jsx-fragment');
+const {JSXText} = require('./jsx-text');
 
 module.exports = {
     ...fragments,
     JSXElement,
     JSXAttribute,
     JSXOpeningElement,
+    JSXText,
     JSXExpressionContainer(path, {print}) {
         print('{');
         print('__expression');
@@ -19,10 +21,6 @@ module.exports = {
     JSXIdentifier(path, {write}) {
         write(path.node.name);
     },
-    JSXText(path, {write}) {
-        const {value} = path.node;
-        write(value);
-    },
     JSXMemberExpression(path, {print}) {
         print('__object');
         print('.');

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

@@ -0,0 +1,27 @@
+'use strict';
+
+const {isNext} = require('../is');
+
+module.exports.JSXText = (path, {write, indent}) => {
+    const {value} = path.node;
+    const isSpacesOnly = /^\s+$/.test(value);
+    const hasNext = isNext(path);
+    
+    if (isSpacesOnly && hasNext) {
+        indent.inc();
+        write.newline();
+        write.indent();
+        indent.dec();
+        
+        return;
+    }
+    
+    if (isSpacesOnly) {
+        write.newline();
+        write.indent();
+        
+        return;
+    }
+    
+    write(value);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.61.0",
+  "version": "1.62.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",