@putout/printer 1.68.0 → 1.69.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.24, v1.69.1
+
+fix:
+- be3dc7d @putout/printer: newline after ObjectProperty
+
+2023.04.23, v1.69.0
+
+feature:
+- fb7202b @putout/printer: improve support of newline after IfStatement inside of ObjectMethod
+
 2023.04.23, v1.68.0
 
 feature:

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

@@ -0,0 +1,36 @@
+'use strict';
+
+module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
+    const {node} = path;
+    
+    const {
+        generator,
+        async,
+    } = node;
+    
+    maybe.write(async, 'async ');
+    write('function');
+    maybe.write(generator, '*');
+    
+    const id = path.get('id');
+    
+    if (id.node) {
+        write.space();
+        traverse(id);
+    }
+    
+    print('(');
+    
+    const params = path.get('params');
+    const n = params.length;
+    
+    for (let i = 0; i < n; i++) {
+        print(params[i]);
+        
+        if (i < n - 1)
+            print(', ');
+    }
+    
+    print(') ');
+    print('__body');
+};

package/lib/tokenize/expressions/functions/functions.js

@@ -3,65 +3,11 @@
 const {ArrowFunctionExpression} = require('./arrow-function-expression');
 const {FunctionDeclaration} = require('./function-declaration');
 const {ClassMethod} = require('./class-method');
+const {ObjectMethod} = require('./object-method');
+const {FunctionExpression} = require('./function-expression');
 
-module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
 module.exports.FunctionDeclaration = FunctionDeclaration;
+module.exports.FunctionExpression = FunctionExpression;
+module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
 module.exports.ClassMethod = ClassMethod;
-
-module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
-    const {node} = path;
-    
-    const {
-        generator,
-        async,
-    } = node;
-    
-    maybe.write(async, 'async ');
-    write('function');
-    maybe.write(generator, '*');
-    
-    const id = path.get('id');
-    
-    if (id.node) {
-        write.space();
-        traverse(id);
-    }
-    
-    print('(');
-    
-    const params = path.get('params');
-    const n = params.length;
-    
-    for (let i = 0; i < n; i++) {
-        print(params[i]);
-        
-        if (i < n - 1)
-            print(', ');
-    }
-    
-    print(') ');
-    print('__body');
-};
-
-module.exports.ObjectMethod = (path, {print}) => {
-    const {kind} = path.node;
-    
-    if (kind !== 'method')
-        print(`${kind} `);
-    
-    print('__key');
-    print('(');
-    
-    const params = path.get('params');
-    const n = params.length - 1;
-    
-    for (let i = 0; i <= n; i++) {
-        print(params[i]);
-        
-        if (i < n)
-            print(', ');
-    }
-    
-    print(') ');
-    print('__body');
-};
+module.exports.ObjectMethod = ObjectMethod;

package/lib/tokenize/expressions/functions/object-method.js

@@ -0,0 +1,24 @@
+'use strict';
+
+module.exports.ObjectMethod = (path, {print}) => {
+    const {kind} = path.node;
+    
+    if (kind !== 'method')
+        print(`${kind} `);
+    
+    print('__key');
+    print('(');
+    
+    const params = path.get('params');
+    const n = params.length - 1;
+    
+    for (let i = 0; i <= n; i++) {
+        print(params[i]);
+        
+        if (i < n)
+            print(', ');
+    }
+    
+    print(') ');
+    print('__body');
+};

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

@@ -5,7 +5,6 @@ const {
     isForOf,
     isIf,
     noTrailingComment,
-
 } = require('../is');
 
 const {isFunction} = require('@babel/types');

package/lib/tokenize/is.js

@@ -86,4 +86,4 @@ module.exports.satisfy = (conditions) => (path) => {
     return false;
 };
 
-module.exports.noTrailingComment = (path) => !path.node.trailingComments;
+module.exports.noTrailingComment = (path) => !path.node.trailingComments?.length;

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

@@ -7,6 +7,8 @@ const {
     exists,
 } = require('../is');
 
+const {isArrowFunctionExpression} = require('@babel/types');
+
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 
 module.exports.BlockStatement = {
@@ -48,6 +50,9 @@ function shouldAddNewlineAfter(path) {
     if (!isNext(path) && !isNext(path.parentPath) && isParentProgram(path.parentPath))
         return false;
     
+    if (path.parentPath.isIfStatement() && path.find(isArrowFunctionExpression))
+        return true;
+    
     if (parentPath.isStatement() && !path.node.body.length && !isNext(parentPath))
         return false;
     

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const {markAfter} = require('../mark');
+const {exists} = require('../is');
 
 const isEmptyConsequent = (path) => path.get('consequent').isEmptyStatement();
 
@@ -33,7 +34,7 @@ module.exports.IfStatement = {
             write('else');
             write.space();
             traverse(alternate);
-        } else if (alternate.node) {
+        } else if (exists(alternate)) {
             write('else');
             print.newline();
             indent.inc();
@@ -53,8 +54,7 @@ module.exports.IfStatement = {
         return true;
     },
     after: (path, {print}) => {
-        print.indent();
-        print.newline();
+        print.linebreak();
         markAfter(path);
     },
 };

package/package.json

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