@putout/printer 5.33.0 → 5.35.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.10.24, v5.35.0
+
+feature:
+- 7664649 @putout/printer: CommentBlock: improve support
+
+2023.10.24, v5.34.0
+
+feature:
+- 66a867a @putout/printer: comments: improve
+
 2023.10.24, v5.33.0
 
 feature:

package/lib/tokenize/comment/parse-comments.js

@@ -1,6 +1,8 @@
 'use strict';
 
-module.exports.parseComments = (path, {write}, semantics) => {
+const {isNext} = require('../is');
+
+module.exports.parseComments = (path, {write, maybe}, semantics) => {
     if (!semantics.comments)
         return;
     
@@ -9,11 +11,20 @@ module.exports.parseComments = (path, {write}, semantics) => {
     if (!comments)
         return;
     
-    for (const {type, value} of comments) {
+    const n = comments.length - 1;
+    const program = path.isProgram();
+    
+    for (const [i, {type, value}] of comments.entries()) {
         if (type === 'CommentLine') {
-            write.breakline();
+            maybe.write.breakline(isNext(path) || !program);
             write('//');
             write(value);
+            
+            if (program) {
+                maybe.write.newline(i < n);
+                continue;
+            }
+            
             write.newline();
             continue;
         }

package/lib/tokenize/comment/parse-trailing-comments.js

@@ -26,6 +26,11 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
             maybe.write.space(sameLine);
             maybe.indent(!sameLine);
             
+            if (path.node.body) {
+                write.breakline();
+                write.breakline();
+            }
+            
             write(`//${value}`);
             maybe.write.newline(!isLast(path) && !isDecorator(path));
             continue;
@@ -33,6 +38,7 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
         
         if (type === 'CommentBlock') {
             maybe.write.space(sameLine);
+            maybe.indent(!sameLine);
             write(`/*${value}*/`);
             maybe.write.newline(!sameLine || isCoupleLines(path.parentPath));
         }

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

@@ -31,8 +31,14 @@ const isMemberExpressionCallee = ({parentPath}) => {
     return likeChain(callee);
 };
 
-module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantics) => {
+module.exports.ObjectExpression = (path, printer, semantics) => {
     const {trailingComma} = semantics;
+    const {
+        print,
+        maybe,
+        indent,
+    } = printer;
+    
     indent.inc();
     
     const properties = path.get('properties');
@@ -42,7 +48,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantic
     
     maybe.print(parens, '(');
     print('{');
-    parseComments(path, {write}, semantics);
+    parseComments(path, printer, semantics);
     maybe.print.newline(manyLines);
     
     const n = properties.length - 1;

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

@@ -29,7 +29,14 @@ const parentIfWithoutElse = ({parentPath}) => {
 };
 
 module.exports.BlockStatement = {
-    print(path, {indent, maybe, write, traverse}, semantics) {
+    print(path, printer, semantics) {
+        const {
+            indent,
+            maybe,
+            write,
+            traverse,
+        } = printer;
+        
         const body = path.get('body');
         const directives = getDirectives(path);
         
@@ -50,7 +57,7 @@ module.exports.BlockStatement = {
             traverse(element);
         }
         
-        parseComments(path, {write}, semantics);
+        parseComments(path, printer, semantics);
         
         indent.dec();
         maybe.indent(body.length);

package/lib/tokenize/statements/program/program.js

@@ -3,10 +3,16 @@
 const {parseComments} = require('../../comment/comment');
 const {getDirectives} = require('../block-statement/get-directives');
 
-module.exports.Program = (path, {print, write, traverse, maybe}, semantics) => {
+module.exports.Program = (path, printer, semantics) => {
     const {body} = path.node;
+    const {
+        print,
+        traverse,
+        maybe,
+    } = printer;
+    
     print('__interpreter');
-    parseComments(path, {write}, semantics);
+    parseComments(path, printer, semantics);
     
     const directives = getDirectives(path);
     

package/lib/tokenize/typescript/type/ts-type-alias-declaration.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isLast} = require('../../is');
+const {isLast, isNext} = require('../../is');
 const {markAfter} = require('../../mark');
 const {maybeDeclare} = require('../../maybe/maybe-declare');
 const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
@@ -32,8 +32,8 @@ module.exports.TSTypeAliasDeclaration = {
         
         return !isNextType(path);
     },
-    after(path, {print}) {
-        print.newline();
+    after(path, {maybe}) {
+        maybe.print.newline(isNext(path) || isNext(path.parentPath));
         markAfter(path);
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "5.33.0",
+  "version": "5.35.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",