@putout/printer 8.19.0 → 8.20.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.24, v8.20.1
+
+feature:
+- 4551754 @putout/printer: ArrayExpression: CallExpression, ObjectExpression
+
+2024.04.23, v8.20.0
+
+feature:
+- 5a53f7e @putout/printer: ArrayExpression: array-object-identifier
+
 2024.04.19, v8.19.0
 
 feature:

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

@@ -7,8 +7,6 @@ const {
     isIdentifierAndIdentifier,
     isStringAndArray,
     isSimpleAndEmptyObject,
-    isNext,
-
 } = require('../../is');
 
 const {
@@ -38,11 +36,36 @@ 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 isSpreadBeforeObject = (a) => {
+    if (!a.isObjectExpression())
+        return false;
+    
+    const prev = a.getPrevSibling();
+    
+    if (!prev.isSpreadElement())
+        return false;
+    
+    if (prev.getPrevSibling().isObjectExpression())
+        return false;
+    
+    return prev
+        .get('argument')
+        .isCallExpression();
+};
+
+const isNextSimple = (a) => {
+    const next = a.getNextSibling();
+    
+    if (next.isSpreadElement())
+        return true;
+    
+    return next.isIdentifier();
+};
+
+const isNextSimpleBetweenObjects = (a) => {
     const next = a.getNextSibling();
-    const is = next.isSpreadElement();
+    const is = next.isSpreadElement() || next.isIdentifier();
     
     if (!is)
         return true;
@@ -101,7 +124,7 @@ module.exports.ArrayExpression = {
         for (const [index, element] of elements.entries()) {
             const is = isNewLine && isCurrentNewLine(element);
             
-            if (isSpreadAfterObject(element))
+            if (isSimpleAfterObject(element))
                 print.newline();
             
             maybe.indent(is);
@@ -110,13 +133,13 @@ module.exports.ArrayExpression = {
             if (index < n || trailingComma)
                 maybe.print(is, ',');
             
-            maybe.print.newline(is && !isNextObject(element));
+            maybe.print.newline((is || isSpreadBeforeObject(element)) && !isNextObject(element));
             maybe.print.space(is && isObjectAfterSimple(element));
             
             if (!is && index < n) {
                 print(',');
                 
-                if (isNextSpreadBetweenObjects(element) || !(element.isObjectExpression() && isNextSpread(element)))
+                if (isNextSimpleBetweenObjects(element) || !(element.isObjectExpression() && isNextSimple(element)))
                     print.space();
             }
         }
@@ -166,8 +189,8 @@ module.exports.ArrayExpression = {
     },
 };
 
-function isSpreadAfterObject(path) {
-    if (!isSpreadElement(path))
+function isSimpleAfterObject(path) {
+    if (!isSpreadElement(path) && !isIdentifier(path))
         return;
     
     const prev = path.getPrevSibling();

package/lib/tokenize/expressions/member-expression/chain.js

@@ -5,7 +5,6 @@ const {assign} = Object;
 module.exports.chain = (path) => {
     const all = [
         ...down(path),
-        
         ...up(path),
     ];
     

package/package.json

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