@putout/printer 8.18.0 → 8.20.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.23, v8.20.0
+
+feature:
+- 5a53f7e @putout/printer: ArrayExpression: array-object-identifier
+
+2024.04.19, v8.19.0
+
+feature:
+- 285747d @putout/printer: ArrayExpression: SpreadAfterObject
+
 2024.04.19, v8.18.0
 
 feature:

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

@@ -36,15 +36,25 @@ 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 isNextSimple = (a) => {
     const next = a.getNextSibling();
-    const is = next.isSpreadElement();
+    
+    if (next.isSpreadElement())
+        return true;
+    
+    return next.isIdentifier();
+};
+
+const isNextSimpleBetweenObjects = (a) => {
+    const next = a.getNextSibling();
+    const is = next.isSpreadElement() || next.isIdentifier();
     
     if (!is)
         return true;
     
-    return next.getNextSibling().isObjectExpression();
+    return next
+        .getNextSibling()
+        .isObjectExpression();
 };
 
 const isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
@@ -96,7 +106,7 @@ module.exports.ArrayExpression = {
         for (const [index, element] of elements.entries()) {
             const is = isNewLine && isCurrentNewLine(element);
             
-            if (index && isSpreadElement(element) && !isNextSpread(element) && !isNextObject(element))
+            if (isSimpleAfterObject(element))
                 print.newline();
             
             maybe.indent(is);
@@ -111,7 +121,8 @@ module.exports.ArrayExpression = {
             if (!is && index < n) {
                 print(',');
                 
-                if (isNextSpreadBetweenObjects(element) || !(element.isObjectExpression() && isNextSpread(element)))
+                if (isNextSimpleBetweenObjects(element) || !(element.isObjectExpression() && isNextSimple(element)))
+                //if (!(element.isObjectExpression() && isNextSimple(element)))
                     print.space();
             }
         }
@@ -160,3 +171,16 @@ module.exports.ArrayExpression = {
         indent.inc();
     },
 };
+
+function isSimpleAfterObject(path) {
+    if (!isSpreadElement(path) && !isIdentifier(path))
+        return;
+    
+    const prev = path.getPrevSibling();
+    const next = path.getNextSibling();
+    
+    if (next.isObjectExpression())
+        return false;
+    
+    return prev.isObjectExpression();
+}

package/package.json

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