@putout/printer 1.99.0 → 1.101.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.18, v1.101.0
+
+feature:
+- d0a81ad @putout/printer: improve support of comments
+
+2023.05.17, v1.100.0
+
+feature:
+- 1b2c36b @putout/printer: IfStatement: improve newline support when nested
+
 2023.05.16, v1.99.0
 
 feature:

package/lib/tokenize/comments.js

@@ -1,6 +1,9 @@
 'use strict';
 
-const {hasTrailingComment} = require('./is');
+const {
+    hasTrailingComment,
+    isLast,
+} = require('./is');
 
 const {markBefore} = require('./mark');
 
@@ -68,7 +71,7 @@ module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
             maybe.indent(!sameLine);
             
             write(`//${value}`);
-            write.newline();
+            maybe.write.newline(!isLast(path));
             continue;
         }
         

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

@@ -10,6 +10,8 @@ const {
     isCallExpression,
 } = require('@babel/types');
 
+const {isSimple} = require('@putout/operate');
+
 const {
     isCoupleLines,
     isStringAndIdentifier,
@@ -21,7 +23,7 @@ const isStringAndArray = ([a, b]) => isStringLiteral(a) && isArrayExpression(b);
 const isStringAndString = ([a, b]) => isStringLiteral(a) && isStringLiteral(b);
 const isIdentifierAndIdentifier = ([a, b]) => isIdentifier(a) && isIdentifier(b);
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
-const isStringAndCall = ([a, b]) => isStringLiteral(a) && isCallExpression(b);
+const isSimpleAndCall = ([a, b]) => isSimple(a) && isCallExpression(b);
 
 const isTwoLongStrings = ([a, b]) => {
     const LONG_STRING = 20;
@@ -221,7 +223,7 @@ function isNewlineBetweenElements(path, {elements}) {
     if (isInsideLoop(path))
         return false;
     
-    if (isStringAndCall(elements))
+    if (isSimpleAndCall(elements))
         return false;
     
     if (isTwoStringsDifferentLength(elements))

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

@@ -9,7 +9,7 @@ const {
     satisfy,
     noTrailingComment,
     hasTrailingComment,
-    exists,
+    isCoupleLines,
 } = require('../is');
 
 const satisfyAfter = satisfy([
@@ -19,23 +19,6 @@ const satisfyAfter = satisfy([
     isNextUp,
 ]);
 
-const isNextLiteral = (path) => {
-    const next = path.getNextSibling();
-    
-    if (!exists(next))
-        return false;
-    
-    const expression = next.get('expression');
-    
-    if (expression.isTemplateLiteral())
-        return true;
-    
-    if (expression.isArrayExpression())
-        return true;
-    
-    return expression.isLiteral();
-};
-
 const shouldBreakline = satisfy([
     isNewlineBetweenSiblings,
     isNotLastBody,
@@ -55,9 +38,6 @@ module.exports.ExpressionStatement = {
         }
     },
     afterIf: (path) => {
-        if (hasTrailingComment(path) && isNextLiteral(path))
-            return false;
-        
         if (satisfyAfter(path))
             return true;
         
@@ -67,10 +47,14 @@ module.exports.ExpressionStatement = {
         return false;
     },
     after(path, {print, maybe, store}) {
-        if (hasTrailingComment(path) && isLast(path)) {
+        if (hasTrailingComment(path) && isLast(path) && isCoupleLines(path)) {
             print.breakline();
         }
         
+        if (hasTrailingComment(path) && !isCoupleLines(path)) {
+            return;
+        }
+        
         print.newline();
         maybe.markAfter(store(), path);
     },

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

@@ -5,6 +5,9 @@ const {exists} = require('../is');
 
 const isEmptyConsequent = (path) => path.get('consequent').isEmptyStatement();
 
+const isInsideIf = (path) => path.parentPath.parentPath?.isIfStatement();
+const isEmptyBody = (path) => !path.node.body.length;
+
 module.exports.IfStatement = {
     print: (path, {indent, print, maybe, write, traverse}) => {
         indent();
@@ -21,6 +24,7 @@ module.exports.IfStatement = {
         if (isConsequentBlock) {
             print.space();
             print(consequent);
+            maybe.print.newline(isEmptyBody(consequent) && isInsideIf(path));
         } else {
             const is = !isEmptyConsequent(path);
             maybe.print.newline(is);
@@ -49,7 +53,7 @@ module.exports.IfStatement = {
     afterIf: (path) => {
         const next = path.getNextSibling();
         
-        if (!next.node)
+        if (!exists(next))
             return false;
         
         if (next.isReturnStatement())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.99.0",
+  "version": "1.101.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -31,6 +31,7 @@
     "@babel/traverse": "^7.21.2",
     "@babel/types": "^7.21.3",
     "@putout/compare": "^9.13.0",
+    "@putout/operate": "^8.11.0",
     "fullstore": "^3.0.0",
     "just-snake-case": "^3.2.0",
     "rendy": "^3.1.1"