@putout/printer 1.7.3 → 1.7.4

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.03.26, v1.7.4
+
+feature:
+- 81adee2 @putout/printer: add newline before comment
+
 2023.03.24, v1.7.3
 
 feature:

package/lib/tokenize/comments.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const {isFirst} = require('./is');
+const {hasPrevNewline} = require('./mark');
+
 module.exports.parseComments = (path, {print}) => {
     const {leadingComments} = path.node;
     
@@ -10,6 +13,9 @@ module.exports.parseComments = (path, {print}) => {
 function parseLeadingComments(path, {print}) {
     const {leadingComments} = path.node;
     
+    if (shouldAddNewline(path))
+        print.linebreak();
+    
     for (const {type, value} of leadingComments) {
         if (type === 'CommentLine') {
             print(`//${value}`);
@@ -23,3 +29,7 @@ function parseLeadingComments(path, {print}) {
         }
     }
 }
+
+function shouldAddNewline(path) {
+    return path.isStatement() && !isFirst(path) && !hasPrevNewline(path);
+}

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

@@ -20,8 +20,9 @@ module.exports.CallExpression = CallExpression;
 function CallExpression(path, {indent, print, maybe}) {
     const isParentCall = toLong(path) && path.parentPath.isCallExpression();
     
-    if (isNewLineBefore(path) && !isMarkedParentBefore(path) && !hasPrevNewline(path.parentPath))
+    if (isNewLineBefore(path) && !isMarkedParentBefore(path) && !hasPrevNewline(path.parentPath)) {
         print.breakline();
+    }
     
     print('__callee');
     print('(');

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

@@ -26,9 +26,9 @@ module.exports.BlockStatement = (path, {indent, maybe, print}) => {
         print(',');
     }
     
-    const shouldAddNewLine = isAddNewLineAfter(path);
+    const shouldAddNewline = isAddNewLineAfter(path);
     
-    if (shouldAddNewLine) {
+    if (shouldAddNewline) {
         print.newline();
     }
 };

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

@@ -8,21 +8,19 @@ const {
 
 const {isNext} = require('../is');
 
-module.exports.ExpressionStatement = (path, {write, indent, traverse, print}) => {
-    if (isCoupleLinesExpression(path) && !isFirst(path) && shouldAddNewLine(path) && !hasPrevNewline(path)) {
+module.exports.ExpressionStatement = (path, {indent, print}) => {
+    if (isCoupleLinesExpression(path) && !isFirst(path) && shouldAddNewline(path) && !hasPrevNewline(path)) {
         print.breakline();
         markBefore(path);
     }
     
-    const expressionPath = path.get('expression');
-    
     indent();
-    traverse(expressionPath);
-    write(';');
-    write.newline();
+    print('__expression');
+    print(';');
+    print.newline();
     
     if (isStrictMode(path) || isCoupleLinesExpression(path) && isNext(path)) {
-        write.newline();
+        print.newline();
         markAfter(path);
     }
 };
@@ -49,7 +47,7 @@ function isFirst(path) {
     return path.node === path.parentPath.node.body[0];
 }
 
-function shouldAddNewLine(path) {
+function shouldAddNewline(path) {
     const prev = path.getPrevSibling();
     
     if (prev.isVariableDeclaration())

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

@@ -36,7 +36,7 @@ module.exports.VariableDeclaration = (path, {maybe, print}) => {
     maybe.print(isParentBlock, ';');
     maybe.print.newline(isParentBlock);
     
-    const is = shouldAddNewLineAfter(path);
+    const is = shouldAddNewlineAfter(path);
     
     if (is) {
         print.linebreak();
@@ -44,7 +44,7 @@ module.exports.VariableDeclaration = (path, {maybe, print}) => {
     }
 };
 
-function shouldAddNewLineAfter(path) {
+function shouldAddNewlineAfter(path) {
     if (isLast(path))
         return true;
     

package/package.json

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