@putout/printer 1.54.5 → 1.56.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.04.19, v1.56.0
+
+feature:
+- aaf4886 @putout/printer: add support of JSXFragment
+
+2023.04.18, v1.55.0
+
+fix:
+- 85dbbd1 @putout/printer: get back satisfy
+
+feature:
+- c540dcb @putout/printer: ForOfStatement: add support of Statement inside of body
+
 2023.04.18, v1.54.5
 
 feature:

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/is.js

@@ -79,5 +79,8 @@ module.exports.isNewlineBetweenStatements = (path) => {
 
 module.exports.satisfy = (conditions) => (path) => {
     for (const condition of conditions)
-        return false;
+        if (condition(path))
+            return true;
+    
+    return false;
 };

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,

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/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/for-of-statement.js

@@ -31,21 +31,19 @@ module.exports.ForOfStatement = {
         
         const bodyPath = path.get('body');
         
-        if (bodyPath.isExpressionStatement()) {
-            indent.inc();
-            print.newline();
-            traverse(bodyPath);
-            maybe.markAfter(isMarkedAfter(bodyPath), path);
-            indent.dec();
-            maybe.print.newline(isNext(path));
-            
-            return;
-        }
-        
         if (bodyPath.isBlockStatement()) {
             print(' ');
             print('__body');
+            
+            return;
         }
+        
+        indent.inc();
+        print.newline();
+        traverse(bodyPath);
+        indent.dec();
+        
+        maybe.markAfter(isMarkedAfter(bodyPath), path);
     },
     afterIf: isNext,
     after(path, {print}) {

package/package.json

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