@putout/printer 6.11.1 → 6.11.3

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.12.01, v6.11.3
+
+feature:
+- f363754 ArrayExpression: isOneLine
+
+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/lib/tokenize/expressions/array-expression/newline.js

@@ -21,6 +21,8 @@ const {
     isCoupleLines,
     isStringAndArray,
     isIdentifierAndIdentifier,
+    satisfy,
+
 } = require('../../is');
 
 const {round} = Math;
@@ -47,17 +49,26 @@ const isSimpleAndObject = ([a, b]) => isSimple(a) && isObjectExpression(b);
 const ONE_LINE = false;
 const MULTI_LINE = true;
 
+const isOneLine = satisfy([
+    isOneSimple,
+    isOneSpread,
+    isIdentifierAndIdentifier,
+    isBooleanAndSimple,
+    isNullAndSimple,
+    isSimpleAndCall,
+    isTwoStringsDifferentLength,
+    isStringAndArray,
+    isStringAndMember,
+    isStringAndIdentifier,
+    isIdentifierAndString,
+    isSimpleAndObject,
+]);
+
 module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
     if (elements.length > 3 && !isObjectExpression(elements[0]))
         return MULTI_LINE;
     
-    if (isOneSimple(path))
-        return ONE_LINE;
-    
-    if (isOneSpread(elements))
-        return ONE_LINE;
-    
-    if (elements.length === 2 && isIdentifierAndIdentifier(elements))
+    if (isOneLine(elements))
         return ONE_LINE;
     
     if (isCallInsideArrow(path))
@@ -69,39 +80,12 @@ module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
     if (isInsideLoop(path))
         return ONE_LINE;
     
-    if (isBooleanAndSimple(elements))
-        return ONE_LINE;
-    
-    if (isNullAndSimple(elements))
-        return ONE_LINE;
-    
-    if (isSimpleAndCall(elements))
-        return ONE_LINE;
-    
     if (isShortTwoSimplesInsideCall(path, maxElementsInOneLine))
         return ONE_LINE;
     
-    if (isTwoStringsDifferentLength(elements))
-        return ONE_LINE;
-    
     if (isTwoSimplesInsideObjectProperty(path))
         return ONE_LINE;
     
-    if (isStringAndArray(elements))
-        return ONE_LINE;
-    
-    if (isStringAndMember(elements))
-        return ONE_LINE;
-    
-    if (isStringAndIdentifier(elements))
-        return ONE_LINE;
-    
-    if (isIdentifierAndString(elements))
-        return ONE_LINE;
-    
-    if (isSimpleAndObject(elements))
-        return ONE_LINE;
-    
     if (isStringAndString(elements) && isParentIsArrayWithFirstArrayElement(path))
         return ONE_LINE;
     
@@ -159,9 +143,7 @@ const isTwoSimplesInsideObjectProperty = (path) => {
     return !isCoupleLines(path);
 };
 
-function isOneSimple(path) {
-    const elements = path.get('elements');
-    
+function isOneSimple(elements) {
     if (elements.length !== 1)
         return false;
     

package/lib/tokenize/is.js

@@ -60,7 +60,14 @@ function isStringAndIdentifier([a, b]) {
     return isStringLiteral(a) && isIdentifier(b);
 }
 
-module.exports.isIdentifierAndIdentifier = ([a, b]) => isIdentifier(a) && isIdentifier(b);
+module.exports.isIdentifierAndIdentifier = (elements) => {
+    if (elements.length !== 2)
+        return false;
+    
+    const [a, b] = elements;
+    
+    return isIdentifier(a) && isIdentifier(b);
+};
 module.exports.isStringAndMember = ([a, b]) => isStringLiteral(a) && isMemberExpression(b);
 module.exports.isIdentifierAndString = ([a, b]) => isIdentifier(a) && isStringLiteral(b);
 module.exports.isStringAndArray = ([a, b]) => {

package/package.json

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