@putout/printer 6.11.1 → 6.11.2

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.12.01, v6.11.2
+
+feature:
+- 8bc537a ArrayExpression: indent
+
 2023.12.01, v6.11.1
 
 feature:

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

@@ -5,7 +5,6 @@ const {
     isStringAndIdentifier,
     isIdentifierAndIdentifier,
     isStringAndArray,
-    isIndented,
 } = require('../../is');
 
 const {
@@ -15,31 +14,18 @@ const {
 } = require('./newline');
 
 const {types} = require('@putout/babel');
+
 const {
-    isObjectExpression,
-    isStringLiteral,
-} = types;
+    isInsideArray,
+    isArrayInsideArray,
+    isArrayIndented,
+} = require('./indent');
 
-const isNextObject = (a) => a.getNextSibling().isObjectExpression();
+const {isObjectExpression} = types;
 
-const isArrayInsideArray = (path) => {
-    if (!path.isArrayExpression() || !path.parentPath.isArrayExpression())
-        return false;
-    
-    return path.parentPath.node.elements.length <= 3;
-};
+const isNextObject = (a) => a.getNextSibling().isObjectExpression();
 
 const isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
-const isInsideArray = (path) => path.parentPath.isArrayExpression();
-
-const isTwoLongStrings = ([a, b]) => {
-    const LONG_STRING = 20;
-    
-    if (!isStringLiteral(a) || !isStringLiteral(b))
-        return false;
-    
-    return a.node.value.length > LONG_STRING;
-};
 
 module.exports.ArrayExpression = {
     beforeIf(path) {
@@ -71,7 +57,7 @@ module.exports.ArrayExpression = {
         
         print('[');
         
-        const indented = !isArrayInsideArray(path) && (!isTwoLongStrings(elements) || !isInsideArray(path) && isIndented(elements[0]));
+        const indented = isArrayIndented(path);
         
         if (indented)
             maybe.indent.inc(shouldIncreaseIndent);

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

@@ -0,0 +1,39 @@
+'use strict';
+
+const {types} = require('@putout/babel');
+const {isStringLiteral} = types;
+
+const {isIndented} = require('../../is');
+
+const isInsideArray = (path) => path.parentPath.isArrayExpression();
+
+module.exports.isInsideArray = isInsideArray;
+
+module.exports.isArrayIndented = (path) => {
+    const elements = path.get('elements');
+    
+    if (isArrayInsideArray(path))
+        return false;
+    
+    const [first] = elements;
+    
+    return !isTwoLongStrings(elements) || !isInsideArray(path) && isIndented(first);
+};
+
+module.exports.isArrayInsideArray = isArrayInsideArray;
+
+function isArrayInsideArray(path) {
+    if (!path.isArrayExpression() || !path.parentPath.isArrayExpression())
+        return false;
+    
+    return path.parentPath.node.elements.length <= 3;
+}
+
+const isTwoLongStrings = ([a, b]) => {
+    const LONG_STRING = 20;
+    
+    if (!isStringLiteral(a) || !isStringLiteral(b))
+        return false;
+    
+    return a.node.value.length > LONG_STRING;
+};

package/package.json

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