@putout/printer 1.133.1 → 1.134.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.05, v1.134.1
+
+feature:
+- 0a80c70 @putout/printer: ArrayExpression: tuple: String, String, Object
+
+2023.06.05, v1.134.0
+
+feature:
+- c8a3dc3 @putout/printer: ArrayExpression: tuple
+
 2023.06.05, v1.133.1
 
 fix:

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

@@ -9,6 +9,7 @@ const {
     isIdentifier,
     isCallExpression,
     isBooleanLiteral,
+    isNullLiteral,
     isObjectExpression,
 } = require('@babel/types');
 
@@ -20,13 +21,21 @@ const {
 } = require('../is');
 
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
-const SECOND = 1;
+
 const isStringAndArray = ([a, b]) => isStringLiteral(a) && isArrayExpression(b);
 const isStringAndString = ([a, b]) => isStringLiteral(a) && isStringLiteral(b);
 const isIdentifierAndIdentifier = ([a, b]) => isIdentifier(a) && isIdentifier(b);
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
 const isSimpleAndCall = ([a, b]) => isSimple(a) && isCallExpression(b);
 const isBooleanAndSimple = ([a, b]) => isBooleanLiteral(a) && isSimple(b);
+const isNullAndSimple = ([a, b]) => isNullLiteral(a) && isSimple(b);
+
+const isStringAndObject = (elements) => {
+    const first = elements.at(0);
+    const last = elements.at(-1);
+    
+    return isStringLiteral(first) && isObjectExpression(last);
+};
 
 const isTwoLongStrings = ([a, b]) => {
     const LONG_STRING = 20;
@@ -61,12 +70,12 @@ module.exports.ArrayExpression = {
     },
     print(path, {print, maybe, indent}) {
         const elements = path.get('elements');
-        const shouldIncreaseIndent = isIncreaseIndent(path);
+        const shouldIncreaseIndent = !isIncreaseIndent(path);
         
         print('[');
         
         if (!isTwoLongStrings(elements))
-            maybe.indent.inc(!shouldIncreaseIndent);
+            maybe.indent.inc(shouldIncreaseIndent);
         
         const isNewLine = isNewlineBetweenElements(path, {
             elements,
@@ -89,7 +98,7 @@ module.exports.ArrayExpression = {
         }
         
         if (!isTwoLongStrings(elements))
-            maybe.indent.dec(!shouldIncreaseIndent);
+            maybe.indent.dec(shouldIncreaseIndent);
         
         const parentElements = path.parentPath.get('elements');
         
@@ -162,7 +171,7 @@ function isIncreaseIndent(path) {
     if (elements[0].isObjectExpression())
         return true;
     
-    if (elements.length > 1 && elements[SECOND].isObjectExpression())
+    if (isStringAndObject(elements))
         return true;
     
     return false;
@@ -236,6 +245,9 @@ function isNewlineBetweenElements(path, {elements}) {
     if (isBooleanAndSimple(elements))
         return false;
     
+    if (isNullAndSimple(elements))
+        return false;
+    
     if (isSimpleAndCall(elements))
         return false;
     

package/package.json

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