@putout/printer 8.16.0 → 8.18.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.19, v8.18.0
+
+feature:
+- 8a56e08 @putout/printer: ArrayExpression: SpreadElement after ObjectExpression
+
+2024.04.16, v8.17.0
+
+feature:
+- 60c64ba @putout/printer: IfStatement: nested no body: improve
+
 2024.04.16, v8.16.0
 
 feature:

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

@@ -36,6 +36,16 @@ 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 isNextSpread = (a) => a.getNextSibling().isSpreadElement();
+const isNextSpreadBetweenObjects = (a) => {
+    const next = a.getNextSibling();
+    const is = next.isSpreadElement();
+    
+    if (!is)
+        return true;
+    
+    return next.getNextSibling().isObjectExpression();
+};
 
 const isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
 
@@ -85,6 +95,10 @@ module.exports.ArrayExpression = {
         
         for (const [index, element] of elements.entries()) {
             const is = isNewLine && isCurrentNewLine(element);
+            
+            if (index && isSpreadElement(element) && !isNextSpread(element) && !isNextObject(element))
+                print.newline();
+            
             maybe.indent(is);
             print(element);
             
@@ -96,7 +110,9 @@ module.exports.ArrayExpression = {
             
             if (!is && index < n) {
                 print(',');
-                print.space();
+                
+                if (isNextSpreadBetweenObjects(element) || !(element.isObjectExpression() && isNextSpread(element)))
+                    print.space();
             }
         }
         
@@ -116,7 +132,7 @@ module.exports.ArrayExpression = {
             maybe.indent(elements.length && isNewLine);
         }
         
-        if (isSimpleAndEmptyObject(elements)) {
+        if (isSimpleAndEmptyObject(elements) && !isSpreadElement(elements.at(-1))) {
             print(',');
             print.breakline();
         }

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/package.json

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