@putout/printer 1.70.2 → 1.70.4

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.25, v1.70.4
+
+feature:
+- b59320e @putout/printer: improve printing of comments after ObjectProperty
+
+2023.04.25, v1.70.3
+
+feature:
+- 0752294 @putout/printer: keep newlines between ObjectProperties
+
 2023.04.25, v1.70.2
 
 fix:

package/lib/tokenize/comments.js

@@ -4,28 +4,30 @@ const {isNext} = require('./is');
 
 const {markBefore} = require('./mark');
 
-module.exports.parseLeadingComments = (path, {print, maybe}) => {
+module.exports.parseLeadingComments = (path, {print, maybe, indent}) => {
     const {leadingComments} = path.node;
     
     if (!leadingComments || !leadingComments.length)
         return;
     
     const insideFn = path.parentPath.isFunction();
-    const isIndent = !path.isClassMethod() && !insideFn;
+    const isProperty = path.isObjectProperty();
+    const isIndent = !path.isClassMethod() && !insideFn && !isProperty;
     
     for (const {type, value} of leadingComments) {
         maybe.indent(isIndent);
         
         if (type === 'CommentLine') {
-            maybe.indent.inc(insideFn);
-            maybe.indent.inc(insideFn);
-            maybe.print.breakline(insideFn);
-            maybe.indent.dec(insideFn);
-            maybe.indent.dec(insideFn);
+            maybeInsideFn(insideFn, {
+                print,
+                indent,
+            });
             
+            maybe.print.space(isProperty);
             print(`//${value}`);
-            print.newline();
             
+            maybe.print.breakline(isProperty);
+            maybe.print.newline(!isProperty);
             continue;
         }
         
@@ -67,3 +69,14 @@ module.exports.parseTrailingComments = (path, {write, maybe}) => {
 function isSameLine(path, loc) {
     return path.node.loc.start.line === loc.start.line;
 }
+
+function maybeInsideFn(insideFn, {print, indent}) {
+    if (!insideFn)
+        return;
+    
+    indent.inc();
+    indent.inc();
+    print.breakline();
+    indent.dec();
+    indent.dec();
+}

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

@@ -5,6 +5,9 @@ const {
     isForOf,
     isIf,
     noTrailingComment,
+    isNewlineBetweenSiblings,
+    noLeadingComment,
+    noComment,
 } = require('../is');
 
 const {isFunction} = require('@babel/types');
@@ -41,7 +44,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
             continue;
         }
         
-        maybe.indent(manyLines);
+        maybe.indent(manyLines && noLeadingComment(property));
         
         if (property.isObjectMethod()) {
             print(property);
@@ -49,7 +52,8 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
         }
         
         print(property);
-        maybe.print.newline(manyLines && noTrailingComment(property));
+        maybe.print.newline(manyLines && noTrailingComment(property) && noComment(property));
+        maybe.print.linebreak(isNewlineBetweenSiblings(property));
     }
     
     indent.dec();

package/lib/tokenize/is.js

@@ -68,7 +68,7 @@ module.exports.isForOf = (path) => {
     return false;
 };
 
-module.exports.isNewlineBetweenStatements = (path) => {
+module.exports.isNewlineBetweenSiblings = (path) => {
     const endCurrent = path.node?.loc?.end?.line;
     const startNext = path.getNextSibling().node?.loc?.start?.line;
     
@@ -87,3 +87,5 @@ module.exports.satisfy = (conditions) => (path) => {
 };
 
 module.exports.noTrailingComment = (path) => !path.node.trailingComments?.length;
+module.exports.noComment = (path) => !path.node.comments?.length;
+module.exports.noLeadingComment = (path) => !path.node.leadingComments?.length;

package/lib/tokenize/statements/export-declarations.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const {isNewlineBetweenStatements} = require('../is');
+const {isNewlineBetweenSiblings} = require('../is');
+
 const {
     markAfter,
     isMarkedAfter,
@@ -66,7 +67,7 @@ module.exports.ExportNamedDeclaration = {
         if (isDeclarationNewline(path))
             return false;
         
-        return isNewlineBetweenStatements(path);
+        return isNewlineBetweenSiblings(path);
     },
     after(path, {print}) {
         print.newline();

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

@@ -5,12 +5,12 @@ const {
     isLast,
     isParentBlock,
     isParentLast,
-    isNewlineBetweenStatements,
+    isNewlineBetweenSiblings,
     satisfy,
 } = require('../is');
 
 const shouldBreakline = satisfy([
-    isNewlineBetweenStatements,
+    isNewlineBetweenSiblings,
     isNotLastBody,
     isStrictMode,
 ]);

package/lib/tokenize/statements/variable-declaration.js

@@ -3,7 +3,7 @@
 const {
     isNext,
     isCoupleLines,
-    isNewlineBetweenStatements,
+    isNewlineBetweenSiblings,
 } = require('../is');
 
 const {hasPrevNewline} = require('../mark');
@@ -42,7 +42,7 @@ module.exports.VariableDeclaration = {
         isNextAssign,
         isNextCoupleLines,
         notLastPrevVarNotNextVar,
-        isNewlineBetweenStatements,
+        isNewlineBetweenSiblings,
         notLastParentExport,
     ],
     after(path, {maybe, store}) {

package/package.json

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