@putout/printer - npm Package Compare versions

Comparing version 1.67.0 to 1.68.0

lib/tokenize/comments.js

@@ -58,6 +58,7 @@ 'use strict';
             const sameLine = isSameLine(path, loc);
+            
             maybe.write.space(sameLine);
             maybe.indent(!sameLine);
             write(`//${value}`);
-            maybe.write.newline(!sameLine);
+            write.newline();
         }
@@ -64,0 +65,0 @@ }

lib/tokenize/expressions/object-expression.js

@@ -7,2 +7,4 @@ 'use strict';
     isIf,
+    noTrailingComment,
+
 } = require('../is');
@@ -50,3 +52,3 @@
         print(property);
-        maybe.print.newline(manyLines);
+        maybe.print.newline(manyLines && noTrailingComment(property));
     }
@@ -53,0 +55,0 @@

lib/tokenize/is.js

@@ -88,1 +88,3 @@ 'use strict';
 };
+
+module.exports.noTrailingComment = (path) => !path.node.trailingComments;

lib/tokenize/maybe/index.js

@@ -26,3 +26,5 @@ 'use strict';
 
-const maybeProgram = (ast) => isProgram(ast) ? ast : Program([ExpressionStatement(ast)]);
+const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
+    ExpressionStatement(ast),
+]);
 
@@ -29,0 +31,0 @@ module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));

lib/tokenize/statements/return-statement.js

 '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();
+    },
 };

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

@@ -28,2 +28,1 @@ 'use strict';
 };
-

package.json

 {
   "name": "@putout/printer",
-  "version": "1.67.0",
+  "version": "1.68.0",
   "type": "commonjs",
@@ -5,0 +5,0 @@ "author": "coderaiser <[e-mail]> (https://github.com/coderaiser)",

No alert changes

Improved metrics

Total package byte prevSize

97582

increased by0.48%

Lines of code

2623

increased by0.65%

No dependency changes