@putout/printer 1.67.0 → 1.69.0

package/ChangeLog

@@ -1,3 +1,13 @@
+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:
+- 4975e30 @putout/printer: comment in ReturnStatement
+
 2023.04.21, v1.67.0
 
 feature:

package/lib/tokenize/comments.js

@@ -55,10 +55,11 @@ module.exports.parseTrailingComments = (path, {write, maybe}) => {
     for (const {type, value, loc} of trailingComments) {
         if (type === 'CommentLine') {
             const sameLine = isSameLine(path, loc);
+            
             maybe.write.space(sameLine);
             maybe.indent(!sameLine);
             write(`//${value}`);
-            maybe.write.newline(!sameLine);
+            write.newline();
         }
     }
 };

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

@@ -0,0 +1,37 @@
+'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,12 @@
 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.ObjectMethod = ObjectMethod;
 
-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');
-};

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

@@ -4,6 +4,7 @@ const {
     isCoupleLines,
     isForOf,
     isIf,
+    noTrailingComment,
 } = require('../is');
 
 const {isFunction} = require('@babel/types');
@@ -46,7 +47,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
         }
         
         print(property);
-        maybe.print.newline(manyLines);
+        maybe.print.newline(manyLines && noTrailingComment(property));
     }
     
     indent.dec();

package/lib/tokenize/is.js

@@ -85,3 +85,5 @@ module.exports.satisfy = (conditions) => (path) => {
     
     return false;
 };
+
+module.exports.noTrailingComment = (path) => !path.node.trailingComments;

package/lib/tokenize/maybe/index.js

@@ -23,7 +23,9 @@ module.exports.maybeThrow = (a, path, b) => {
     }));
 };
 
-const maybeProgram = (ast) => isProgram(ast) ? ast : Program([ExpressionStatement(ast)]);
+const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
+    ExpressionStatement(ast),
+]);
 
 module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));
 

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

@@ -6,6 +6,7 @@ const {
     isLast,
     exists,
 } = require('../is');
+const {isObjectMethod} = require('@babel/types');
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 
@@ -48,6 +49,9 @@ function shouldAddNewlineAfter(path) {
     if (!isNext(path) && !isNext(path.parentPath) && isParentProgram(path.parentPath))
         return false;
     
+    if (path.find(isObjectMethod))
+        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/lib/tokenize/statements/return-statement.js

@@ -1,25 +1,38 @@
 'use strict';
 
-const {isPrevBody} = require('../is');
+const {
+    isPrevBody,
+    noTrailingComment,
+} = require('../is');
+
 const {hasPrevNewline} = require('../mark');
 const isBodyLength = ({parentPath}) => parentPath.node?.body?.length > 2;
 
-module.exports.ReturnStatement = (path, {indent, traverse, print}) => {
-    if (!hasPrevNewline(path) && isBodyLength(path) || isPrevBody(path)) {
+module.exports.ReturnStatement = {
+    beforeIf(path) {
+        return !hasPrevNewline(path) && isBodyLength(path) || isPrevBody(path);
+    },
+    before(path, {print}) {
         print.indent();
         print.newline();
-    }
-    
-    indent();
-    print('return');
-    
-    const argPath = path.get('argument');
-    
-    if (argPath.node) {
-        print(' ');
-        traverse(argPath);
-    }
-    
-    print(';');
-    print.newline();
+    },
+    print(path, {indent, traverse, print}) {
+        indent();
+        print('return');
+        
+        const argPath = path.get('argument');
+        
+        if (argPath.node) {
+            print(' ');
+            traverse(argPath);
+        }
+        
+        print(';');
+    },
+    afterSatisfy: () => [
+        noTrailingComment,
+    ],
+    after(path, {print}) {
+        print.newline();
+    },
 };

package/lib/tokenize/typescript/ts-type-parameter.js

@@ -25,4 +25,3 @@ module.exports.TSTypeParameter = (path, {write, traverse}) => {
     
     traverse(constraint);
 };
-

package/package.json

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