@putout/printer 1.1.1 → 1.1.3

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

@@ -1,11 +1,13 @@
 'use strict';
 
+const {hasPrevNewline} = require('../mark');
+
 const {entries} = Object;
 
 module.exports.CallExpression = (path, {traverse, indent, write, incIndent, decIndent, maybeWrite}) => {
     const isParentCall = toLong(path) && path.parentPath.isCallExpression();
     
-    if (shouldAddNewLine(path)) {
+    if (shouldAddNewLine(path) && !hasPrevNewline(path.parentPath)) {
         write.newline();
         write.indent();
     }
@@ -75,3 +77,4 @@ function toLong(path) {
     
     return false;
 }
+

package/lib/tokenize/is.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports.isPrevBody = (path) => path.getPrevSibling().isBlockStatement();

package/lib/tokenize/mark.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const WATER_MARK = '__putout_newline';
+
+module.exports.mark = mark;
+
+function mark(path) {
+    path[WATER_MARK] = true;
+}
+
+module.exports.isMarked = isMarked;
+
+function isMarked(path) {
+    return path[WATER_MARK];
+}
+
+module.exports.hasPrevNewline = (path) => {
+    return isMarked(path.getPrevSibling());
+};
+
+module.exports.maybeMark = (a, path) => a && mark(path);

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

@@ -5,6 +5,9 @@ const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 module.exports.BlockStatement = (path, {write, indent, traverse}) => {
     const body = path.get('body');
     
+    if (path.parentPath.isBlockStatement())
+        indent();
+    
     indent.inc();
     write('{');
     

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

@@ -1,7 +1,9 @@
 'use strict';
 
+const {hasPrevNewline} = require('../mark');
+
 module.exports.IfStatement = (path, {write, indent, traverse, incIndent, decIndent}) => {
-    if (!isFirst(path)) {
+    if (!isFirst(path) && !hasPrevNewline(path)) {
         indent();
         write('\n');
     }

package/lib/tokenize/statements/index.js

@@ -5,6 +5,7 @@ const {VariableDeclaration} = require('./variable-declaration');
 const {IfStatement} = require('./if-statement');
 const {ForOfStatement} = require('./for-of-statement');
 const {BlockStatement} = require('./block-statement');
+const {ReturnStatement} = require('./return-statement');
 
 module.exports = {
     BlockStatement,
@@ -12,6 +13,7 @@ module.exports = {
     VariableDeclaration,
     IfStatement,
     ForOfStatement,
+    ReturnStatement,
     Program(path, {traverse}) {
         path.get('body').forEach(traverse);
     },
@@ -19,24 +21,5 @@ module.exports = {
         indent();
         write('continue;\n');
     },
-    ReturnStatement(path, {indent, write, traverse}) {
-        if (path?.parentPath?.node?.body?.length > 2) {
-            write.indent();
-            write.newline();
-        }
-        
-        indent();
-        write('return');
-        
-        const argPath = path.get('argument');
-        
-        if (argPath.node) {
-            write(' ');
-            traverse(argPath);
-        }
-        
-        write(';');
-        write.newline();
-    },
 };
 

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

@@ -0,0 +1,25 @@
+'use strict';
+
+const {isPrevBody} = require('../is');
+const isBodyLength = ({parentPath}) => parentPath.node?.body?.length > 2;
+
+module.exports.ReturnStatement = (path, {indent, write, traverse}) => {
+    if (isBodyLength(path) || isPrevBody(path)) {
+        write.indent();
+        write.newline();
+    }
+    
+    indent();
+    write('return');
+    
+    const argPath = path.get('argument');
+    
+    if (argPath.node) {
+        write(' ');
+        traverse(argPath);
+    }
+    
+    write(';');
+    write.newline();
+};
+

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

@@ -30,6 +30,7 @@ module.exports.VariableDeclaration = (path, {write, maybe, maybeIndent, traverse
     
     maybe.indent(is);
     maybe.write(is, '\n');
+    maybe.mark(is, path);
 };
 function isCoupleLinesExpression(path) {
     const start = path.node?.loc?.start.line;

package/lib/tokenize/tokenize.js

@@ -6,6 +6,7 @@ const statements = require('./statements');
 const literals = require('./literals');
 const {TYPES} = require('../types');
 const {createDebug} = require('./debug');
+const {maybeMark} = require('./mark');
 
 const {assign} = Object;
 
@@ -67,6 +68,7 @@ module.exports.tokenize = (ast) => {
     const maybe = {
         write: maybeWrite,
         indent: maybeIndent,
+        mark: maybeMark,
     };
     
     const printer = {

package/package.json

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