@putout/printer 2.26.1 → 2.28.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.19, v2.28.0
+
+feature:
+- 10230c2 @putout/printer: ObjectExpression inside ArrayExpression: newline
+
+2023.06.19, v2.27.0
+
+feature:
+- 9fedd57 @putout/printer: ClassMethod: computed (coderaiser/minify#106)
+
 2023.06.19, v2.26.1
 
 fix:

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

@@ -226,6 +226,9 @@ function isIncreaseIndent(path) {
     if (elements[0].isObjectExpression())
         return true;
     
+    if (isSpreadElement(elements[1]))
+        return false;
+    
     return isStringAndObject(elements);
 }
 
@@ -242,3 +245,10 @@ const isStringAndObject = (elements) => {
     
     return isStringLiteral(first) && isObjectExpression(last);
 };
+
+module.exports.isCurrentNewLine = (path) => {
+    if (path.isSpreadElement())
+        return true;
+    
+    return !path.isObjectExpression();
+};

package/lib/tokenize/expressions/functions/class-method.js

@@ -5,13 +5,18 @@ const {printParams} = require('./params');
 
 const ClassMethod = {
     print(path, {print, maybe}) {
-        const {kind} = path.node;
+        const {kind, computed} = path.node;
         const isConstructor = kind === 'constructor';
         const isMethod = kind === 'method';
         const isGetter = /get|set/.test(kind);
         
         maybe.print(isConstructor, kind);
-        maybe.print(isMethod, '__key');
+        
+        if (isMethod) {
+            maybe.print(computed, '[');
+            print('__key');
+            maybe.print(computed, ']');
+        }
         
         if (isGetter) {
             print(kind);

package/package.json

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