@putout/printer 1.88.0 → 1.90.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.05.10, v1.90.0
+
+feature:
+- 5cd1dcc @putout/printer: add support of comments inside BlockStatement
+
+2023.05.09, v1.89.0
+
+fix:
+- 17bae21 @putout/printer: rm useless condition
+
+feature:
+- bf25bda @putout/printer: ForOfStatement: newline
+
 2023.05.09, v1.88.0
 
 feature:

package/lib/tokenize/comments.js

@@ -80,6 +80,22 @@ module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
     }
 };
 
+module.exports.parseComments = (path, {write}) => {
+    const {comments} = path.node;
+    
+    if (!comments)
+        return;
+    
+    for (const {type, value} of path.node.comments) {
+        if (type === 'CommentLine') {
+            write.breakline();
+            write('//');
+            write(value);
+            write.newline();
+        }
+    }
+};
+
 function isSameLine(path, loc) {
     return path.node.loc.start.line === loc.start.line;
 }

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

@@ -13,12 +13,13 @@ const {
 } = require('@babel/types');
 
 const {markAfter} = require('../mark');
+const {parseComments} = require('../comments');
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 const isMethodOrArrow = (path) => isArrowFunctionExpression(path) || isObjectMethod(path);
 
 module.exports.BlockStatement = {
-    print(path, {indent, maybe, print}) {
+    print(path, {indent, maybe, print, write}) {
         const body = path.get('body');
         
         if (path.parentPath.isBlockStatement())
@@ -27,13 +28,15 @@ module.exports.BlockStatement = {
         indent.inc();
         print('{');
         
-        if (body.length > 1 || isFirstStatement(path))
+        if (isFirstStatement(path))
             print.newline();
         
         for (const element of body) {
             print(element);
         }
         
+        parseComments(path, {write});
+        
         indent.dec();
         maybe.indent(body.length);
         print('}');
@@ -98,3 +101,4 @@ function isTry({parentPath}) {
     
     return false;
 }
+

package/lib/tokenize/statements/for-of-statement.js

@@ -10,6 +10,7 @@ const {
 const {
     isFirst,
     isNext,
+    isLast,
 } = require('../is');
 
 module.exports.ForOfStatement = {
@@ -34,6 +35,9 @@ module.exports.ForOfStatement = {
             print(' ');
             print('__body');
             
+            const {length} = bodyPath.node.body;
+            maybe.print.newline(!length && !isLast(path) && !isNext(path));
+            
             return;
         }
         
@@ -44,7 +48,12 @@ module.exports.ForOfStatement = {
         
         maybe.markAfter(isMarkedAfter(bodyPath), path);
     },
-    afterIf: isNext,
+    afterIf: (path) => {
+        if (isNext(path))
+            return true;
+        
+        return false;
+    },
     after(path, {print}) {
         print.linebreak();
         markAfter(path);

package/lib/tokenize/typescript/ts-module-declaration.js

@@ -18,4 +18,3 @@ module.exports.TSModuleDeclaration = (path, {print}) => {
     print.space();
     print('__body');
 };
-

package/package.json

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