@putout/printer 6.9.0 → 6.11.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.11.30, v6.11.0
+
+feature:
+- 6390281 @putout/printer: improve support of comments
+
+2023.11.30, v6.10.0
+
+feature:
+- dfe625e @putout/printer: ObjectProperty: comments: improve
+
 2023.11.30, v6.9.0
 
 feature:

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

@@ -28,6 +28,33 @@ const isProperty = satisfy([
     isSpreadElement,
 ]);
 
+function isCommentOfPrevious(path) {
+    const [comment] = path.node.leadingComments;
+    const {line} = comment.loc.start;
+    
+    return path.getPrevSibling().node?.loc.start.line === line;
+}
+
+function isCommentOnPreviousLine(path) {
+    const {
+        loc,
+        leadingComments,
+    } = path.node;
+    
+    if (!isProperty(path))
+        return false;
+    
+    const [comment] = leadingComments;
+    const {line} = comment.loc.start;
+    
+    if (isCommentOfPrevious(path))
+        return false;
+    
+    return line === loc.start.line - 1;
+}
+
+const isFirst = (path) => path === path.parentPath?.get('properties')[0];
+
 module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
     if (!semantics.comments)
         return;
@@ -45,7 +72,7 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
     const insideFn = path.parentPath.isFunction();
     
     const propIs = isProperty(path);
-    const isIndent = !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !propIs;
+    const isIndent = isFirst(path) || !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !propIs;
     
     for (const {type, value} of deduplicate(leadingComments)) {
         maybe.indent(isIndent);
@@ -56,7 +83,11 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
                 indent,
             });
             
-            maybe.print.space(propIs && !path.isClassProperty());
+            if (isCommentOnPreviousLine(path))
+                maybe.print.breakline(!isFirst(path));
+            else
+                maybe.print.space(propIs && !path.isClassProperty());
+            
             print(`//${value}`);
             
             const isParentSwitch = path.parentPath.isSwitchCase();

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

@@ -15,6 +15,8 @@ function isSameLine(path, loc) {
 
 const isTrailingIsLeading = (path) => path.node.trailingComments === path.getNextSibling().node?.leadingComments;
 
+module.exports.isTrailingIsLeading = isTrailingIsLeading;
+
 function isCommentOnNextLine(path) {
     const {
         loc,
@@ -27,6 +29,11 @@ function isCommentOnNextLine(path) {
     const [comment] = trailingComments;
     const {line} = comment.loc.start;
     
+    const next = path.getNextSibling();
+    
+    if (line < next.node?.loc.start.line)
+        return false;
+    
     return line === loc.start.line + 1;
 }
 
@@ -72,4 +79,3 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
         }
     }
 };
-

package/package.json

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