@putout/printer 1.13.0 → 1.13.1

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.03.29, v1.13.1
+
+feature:
+- d320519 @putout/printer: improve support of nested objects
+
 2023.03.29, v1.13.0
 
 feature:

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

@@ -1,32 +1,58 @@
 'use strict';
 
+const {round} = Math;
+
 const {isObjectProperty} = require('@babel/types');
 const {isCoupleLines} = require('../is');
-const {entries} = Object;
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 const SECOND = 1;
 
-module.exports.ArrayExpression = (path, {print, maybe}) => {
+const isStringAndArray = ([a, b]) => a?.isStringLiteral() && b?.isArrayExpression();
+const isTwoLongStrings = ([a, b]) => {
+    const LONG_STRING = 20;
+    
+    if (!a?.isStringLiteral() || !b?.isStringLiteral())
+        return false;
+    
+    if (a.node.value.length > LONG_STRING)
+        return true;
+    
+    return false;
+};
+
+module.exports.ArrayExpression = (path, {print, maybe, indent}) => {
     const elements = path.get('elements');
-    const elementIsObject = isElementObject(path);
+    const shouldIncreaseIndent = isIncreaseIndent(path);
     
     print('[');
-    maybe.indent.inc(!elementIsObject);
     
-    const isNewLine = !elementIsObject && isNewLineBefore(path, {elements});
+    if (!isTwoLongStrings(elements) && !shouldIncreaseIndent) {
+        indent.inc();
+    }
+    
+    const isNewLine = isNewlineBetweenElements(path, {elements});
     const n = elements.length - 1;
     
     maybe.print(isNewLine && elements.length, '\n');
     
-    for (const [index, element] of entries(elements)) {
+    for (const [index, element] of elements.entries()) {
         maybe.indent(isNewLine);
         print(element);
         maybe.print(isNewLine, ',\n');
         maybe.print(!isNewLine && index < n, ', ');
     }
     
-    maybe.indent.dec(!elementIsObject);
-    maybe.indent(elements.length && isNewLine);
+    if (!isTwoLongStrings(elements))
+        maybe.indent.dec(!shouldIncreaseIndent);
+    
+    if (path.parentPath.isArrayExpression() && isStringAndArray(path.parentPath.get('elements'))) {
+        indent.dec();
+        maybe.indent(elements.length && isNewLine);
+        indent.inc();
+    } else {
+        maybe.indent(elements.length && isNewLine);
+    }
+    
     print(']');
 };
 
@@ -55,7 +81,7 @@ function isParentProperty(path) {
     return path.find(isObjectProperty);
 }
 
-function isElementObject(path) {
+function isIncreaseIndent(path) {
     const elements = path.get('elements');
     
     if (!elements.length)
@@ -84,9 +110,29 @@ function tooLong(path) {
     return false;
 }
 
-function isNewLineBefore(path, {elements}) {
+function isNewlineBetweenElements(path, {elements}) {
+    if (isIncreaseIndent(path))
+        return false;
+    
+    if (isTwoStringsDifferentLength(elements))
+        return false;
+    
+    if (isStringAndArray(elements))
+        return false;
+    
     if (tooLong(path) || isCoupleLines(path) || !isNumbers(elements) && !isForOf(path) && isLastArg(path) && !isParentProperty(path))
         return true;
     
     return false;
 }
+
+function isTwoStringsDifferentLength([a, b]) {
+    if (!a?.isStringLiteral() || !b?.isStringLiteral())
+        return false;
+    
+    const aLength = a.node.value.length;
+    const bLength = b.node.value.length;
+    
+    return round(bLength / aLength) > 2;
+}
+

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const {isCoupleLines} = require('../is');
+
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
 
@@ -89,3 +90,4 @@ function isOneLine(path) {
     
     return isForOf(path);
 }
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",