@putout/printer 8.20.0 → 8.21.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.29, v8.21.0
+
+feature:
+- 2abb228 @putout/printer: comments: improve
+
+2024.04.24, v8.20.1
+
+feature:
+- 4551754 @putout/printer: ArrayExpression: CallExpression, ObjectExpression
+
 2024.04.23, v8.20.0
 
 feature:

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

@@ -54,7 +54,7 @@ function isCommentOnNextLine(path) {
     if (isTrailingIsLeading(path))
         return false;
     
-    if (trailingComments.length > 1)
+    if (path.isThrowStatement())
         return false;
     
     const [comment] = trailingComments;
@@ -82,7 +82,7 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
     
     const n = trailingComments.length - 1;
     
-    for (const {type, value, loc} of trailingComments) {
+    for (const [index, {type, value, loc}] of trailingComments.entries()) {
         const sameLine = isSameLine(path, loc);
         const commentOnNextLine = isCommentOnNextLine(path);
         

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

@@ -36,6 +36,24 @@ const isPrevObject = (a) => a.getPrevSibling().isObjectExpression();
 const isObjectAfterSpread = (a) => isSpreadElement(a) && isNextObject(a) && !isPrevObject(a);
 const isObjectAfterIdentifier = (a) => isIdentifier(a) && isNextObject(a) && !isPrevObject(a);
 const isObjectAfterSimple = (a) => isObjectAfterSpread(a) || isObjectAfterIdentifier(a);
+
+const isSpreadBeforeObject = (a) => {
+    if (!a.isObjectExpression())
+        return false;
+    
+    const prev = a.getPrevSibling();
+    
+    if (!prev.isSpreadElement())
+        return false;
+    
+    if (prev.getPrevSibling().isObjectExpression())
+        return false;
+    
+    return prev
+        .get('argument')
+        .isCallExpression();
+};
+
 const isNextSimple = (a) => {
     const next = a.getNextSibling();
     
@@ -115,14 +133,13 @@ module.exports.ArrayExpression = {
             if (index < n || trailingComma)
                 maybe.print(is, ',');
             
-            maybe.print.newline(is && !isNextObject(element));
+            maybe.print.newline((is || isSpreadBeforeObject(element)) && !isNextObject(element));
             maybe.print.space(is && isObjectAfterSimple(element));
             
             if (!is && index < n) {
                 print(',');
                 
                 if (isNextSimpleBetweenObjects(element) || !(element.isObjectExpression() && isNextSimple(element)))
-                //if (!(element.isObjectExpression() && isNextSimple(element)))
                     print.space();
             }
         }

package/lib/tokenize/is.js

@@ -123,7 +123,17 @@ module.exports.satisfy = (conditions) => (path) => {
     return false;
 };
 
-module.exports.hasTrailingComment = (path) => path.node?.trailingComments?.length;
+const parseNode = (path) => path.node || path;
+
+module.exports.hasCoupleTrailingComments = (path) => {
+    const node = parseNode(path);
+    return node?.trailingComments?.length > 1;
+};
+
+module.exports.hasTrailingComment = (path) => {
+    const node = parseNode(path);
+    return node.trailingComments?.length;
+};
 module.exports.hasLeadingComment = (path) => path.node?.leadingComments?.length;
 
 module.exports.noTrailingComment = (path) => !path.node.trailingComments?.length;

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

@@ -2,6 +2,10 @@
 
 const {parseComments} = require('../../comment/comment');
 const {getDirectives} = require('../block-statement/get-directives');
+const {
+    hasTrailingComment,
+    hasCoupleTrailingComments,
+} = require('../../is');
 
 module.exports.Program = (path, printer, semantics) => {
     const {body} = path.node;
@@ -28,5 +32,8 @@ module.exports.Program = (path, printer, semantics) => {
     if (directives.length && !body.length)
         return;
     
+    if (body.length && hasCoupleTrailingComments(body.at(-1)))
+        return;
+    
     write.endOfFile();
 };

package/package.json

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