@putout/printer 2.27.0 → 2.29.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.19, v2.29.0
+
+feature:
+- feb7c6a @putout/printer: ArrayExpression: String/String: tuple
+
+2023.06.19, v2.28.0
+
+feature:
+- 10230c2 @putout/printer: ObjectExpression inside ArrayExpression: newline
+
 2023.06.19, v2.27.0
 
 feature:

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

@@ -10,8 +10,13 @@ const {
 const {
     isNewlineBetweenElements,
     isIncreaseIndent,
+    isCurrentNewLine,
 } = require('./new-line');
 
+const {isObjectExpression} = require('@babel/types');
+
+const isNextObject = (a) => a.getNextSibling().isObjectExpression();
+
 const isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
 
@@ -63,19 +68,22 @@ module.exports.ArrayExpression = {
         maybe.print.newline(isNewLine && elements.length);
         
         for (const [index, element] of elements.entries()) {
-            maybe.indent(isNewLine);
+            const is = isNewLine && isCurrentNewLine(element);
+            maybe.indent(is);
             print(element);
-            maybe.print(isNewLine, ',');
-            maybe.print.newline(isNewLine);
+            maybe.print(is, ',');
+            maybe.print.newline(is && !isNextObject(element));
+            maybe.print.space(element.isSpreadElement() && isNextObject(element));
             
-            if (!isNewLine && index < n) {
+            if (!is && index < n) {
                 print(',');
                 print.space();
             }
         }
         
-        if (!isTwoLongStrings(elements))
+        if (!isTwoLongStrings(elements)) {
             maybe.indent.dec(shouldIncreaseIndent);
+        }
         
         const parentElements = path.parentPath.get('elements');
         
@@ -83,7 +91,7 @@ module.exports.ArrayExpression = {
             indent.dec();
             maybe.indent(elements.length && isNewLine);
             indent.inc();
-        } else {
+        } else if (!isObjectExpression(elements.at(-1))) {
             maybe.indent(elements.length && isNewLine);
         }
         

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

@@ -84,6 +84,9 @@ module.exports.isNewlineBetweenElements = (path, {elements, maxElementsInOneLine
     if (isTwoStringsDifferentLength(elements))
         return ONE_LINE;
     
+    if (isShortTwoSimplesInsideObjectProperty(path, maxElementsInOneLine))
+        return ONE_LINE;
+    
     if (isStringAndArray(elements))
         return ONE_LINE;
     
@@ -128,6 +131,30 @@ const isShortTwoSimplesInsideCall = (path, short) => {
     return length < short;
 };
 
+const isShortTwoSimplesInsideObjectProperty = (path, short) => {
+    const {node, parentPath} = path;
+    
+    const {elements} = node;
+    const {length} = elements;
+    const [a, b] = elements;
+    
+    if (length > 2)
+        return false;
+    
+    if (!parentPath.isObjectProperty())
+        return false;
+    
+    if (!isStringLiteral(a) || !isStringLiteral(b))
+        return false;
+    
+    if (looksLikeTuple(a, b))
+        return false;
+    
+    return length < short;
+};
+
+const looksLikeTuple = (a, b) => b.value.length + 5 <= a.value.length * 2;
+
 function isOneSimple(path) {
     const elements = path.get('elements');
     
@@ -226,6 +253,9 @@ function isIncreaseIndent(path) {
     if (elements[0].isObjectExpression())
         return true;
     
+    if (isSpreadElement(elements[1]))
+        return false;
+    
     return isStringAndObject(elements);
 }
 
@@ -242,3 +272,10 @@ const isStringAndObject = (elements) => {
     
     return isStringLiteral(first) && isObjectExpression(last);
 };
+
+module.exports.isCurrentNewLine = (path) => {
+    if (path.isSpreadElement())
+        return true;
+    
+    return !path.isObjectExpression();
+};

package/package.json

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