@putout/printer 8.11.0 → 8.12.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2024.04.11, v8.12.0
+
+feature:
+- 426fccf @putout/printer: ArrayExpression, ObjectExpression: improve support of printing Identifier, Object inside Arrray
+
 2024.04.09, v8.11.0
 
 feature:

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

@@ -24,6 +24,7 @@ const {
     isObjectExpression,
     isSpreadElement,
     isStringLiteral,
+    isIdentifier,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
@@ -32,6 +33,8 @@ const isAroundStrings = (path) => isNextString(path) || isPrevString(path);
 const isNextObject = (a) => a.getNextSibling().isObjectExpression();
 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 isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
 
@@ -88,7 +91,7 @@ module.exports.ArrayExpression = {
                 maybe.print(is, ',');
             
             maybe.print.newline(is && !isNextObject(element));
-            maybe.print.space(isObjectAfterSpread(element));
+            maybe.print.space(is && isObjectAfterSimple(element));
             
             if (!is && index < n) {
                 print(',');

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

@@ -12,6 +12,7 @@ const {
     isNullLiteral,
     isStringLiteral,
     isSpreadElement,
+    isIdentifier,
 } = require('@putout/babel').types;
 
 const {
@@ -21,6 +22,7 @@ const {
     isCoupleLines,
     isStringAndArray,
     isIdentifierAndIdentifier,
+    isIdentifierAndObject,
 } = require('../../is');
 
 const {round} = Math;
@@ -60,6 +62,9 @@ module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
     if (elements.length > 3 && !isObjectExpression(elements[0]))
         return MULTI_LINE;
     
+    if (isIdentifierAndObject(elements))
+        return MULTI_LINE;
+    
     if (isOneSimple(path))
         return ONE_LINE;
     

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

@@ -9,6 +9,7 @@ const {
     noLeadingComment,
     hasLeadingComment,
     exists,
+    isIdentifierAndObject,
 } = require('../../is');
 
 const {parseComments} = require('../../comment/comment');
@@ -88,8 +89,24 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
     }
     
     indent.dec();
+    const isInsideArrayWithIdentifierFirst = ({parentPath}) => {
+        if (!parentPath.isArrayExpression())
+            return false;
+        
+        return isIdentifierAndObject(parentPath.get('elements'));
+    };
+    
     maybe.indent(manyLines);
-    print('}');
+    
+    if (isInsideArrayWithIdentifierFirst(path)) {
+        print('},');
+        indent.dec();
+        print.breakline();
+        indent.inc();
+    } else {
+        print('}');
+    }
+    
     maybe.print(parens, ')');
     
     maybe.indent.dec(isMemberExpressionCallee(path));
@@ -149,3 +166,4 @@ function isParens(path) {
     
     return isParentExpression(path);
 }
+

package/lib/tokenize/is.js

@@ -9,6 +9,7 @@ const {
     isVariableDeclaration,
     isMemberExpression,
     isArrayExpression,
+    isObjectExpression,
 } = require('@putout/babel').types;
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
@@ -60,6 +61,16 @@ function isStringAndIdentifier([a, b]) {
     return isStringLiteral(a) && isIdentifier(b);
 }
 
+module.exports.isIdentifierAndObject = ([a, b]) => {
+    if (!isIdentifier(a))
+        return false;
+    
+    if (!isObjectExpression(b))
+        return false;
+    
+    return b.node.properties.length;
+};
+
 module.exports.isIdentifierAndIdentifier = ([a, b]) => {
     return isIdentifier(a) && isIdentifier(b);
 };

package/package.json

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