@putout/printer 8.15.0 → 8.17.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.16, v8.17.0
+
+feature:
+- 60c64ba @putout/printer: IfStatement: nested no body: improve
+
+2024.04.16, v8.16.0
+
+feature:
+- 95b0c77 @putout/printer: ImprotDeclaration: maxSpecifiersInOneLine: align to eslint-plugin-putout
+
 2024.04.16, v8.15.0
 
 feature:

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

@@ -67,11 +67,31 @@ module.exports.ExpressionStatement = {
         if (hasTrailingComment(path) && !isCoupleLines(path))
             return;
         
+        if (isTopParentLast(path))
+            return;
+        
         print.newline();
         maybe.markAfter(store(), path);
     },
 };
 
+function isTopParentLast({parentPath}) {
+    if (!parentPath.isIfStatement())
+        return false;
+    
+    const nextParent = parentPath.parentPath;
+    
+    if (!nextParent.isIfStatement())
+        return false;
+    
+    const nextNext = nextParent.parentPath;
+    
+    if (!nextNext.isIfStatement())
+        return false;
+    
+    return isLast(nextNext);
+}
+
 function isNotLastBody(path) {
     return path.parentPath.get('body') === path;
 }

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

@@ -56,7 +56,12 @@ module.exports.IfStatement = {
             write.space();
             traverse(alternate);
         } else if (alternate.isIfStatement()) {
-            write(' else ');
+            if (alternate.get('consequent').isBlockStatement())
+                write.space();
+            else
+                indent();
+            
+            write('else ');
             traverse(alternate);
         } else if (exists(alternate)) {
             maybe.write.newline(isVar);
@@ -69,6 +74,9 @@ module.exports.IfStatement = {
             indent.dec();
         }
         
+        if (!isNext(path) && !consequent.isBlockStatement())
+            return;
+        
         if (path === partOfAlternate && isInside(path))
             print.newline();
     },

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

@@ -56,7 +56,7 @@ module.exports.ImportDeclaration = {
             indent.inc();
             
             maybe.write(!wasSpecifier, '{');
-            maybe.write.breakline(importsCount > maxSpecifiersInOneLine);
+            maybe.write.breakline(importsCount >= maxSpecifiersInOneLine);
             
             wasSpecifier = true;
             write(imported.name);
@@ -66,12 +66,12 @@ module.exports.ImportDeclaration = {
                 write(spec.node.local.name);
             }
             
-            if (importsCount <= maxSpecifiersInOneLine && notLast) {
+            if (importsCount < maxSpecifiersInOneLine && notLast) {
                 maybe.write(n, ',');
                 maybe.write.space(n);
             }
             
-            if (importsCount > maxSpecifiersInOneLine) {
+            if (importsCount >= maxSpecifiersInOneLine) {
                 maybe.write(n, ',');
                 
                 const last = index === n;
@@ -115,7 +115,7 @@ function parseMaxSpecifiers(imports, options) {
     
     for (const {node} of imports) {
         if (node.imported.name !== node.local.name)
-            return 0;
+            return 1;
     }
     
     return maxSpecifiersInOneLine;

package/package.json

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