@putout/printer 6.11.3 → 6.11.5

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.12.01, v6.11.5
+
+feature:
+- 96f6f4b @putout/printer: ArrayExpression: newline: isMultiLine
+
+2023.12.01, v6.11.4
+
+feature:
+- d181e1c @putout/printer: ArrayExpression: notNumbersInsideForOf
+
 2023.12.01, v6.11.3
 
 feature:

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

@@ -1,6 +1,39 @@
 'use strict';
 
 const {isSimple} = require('@putout/operate');
+const isTwoStringsTupleAndParentIsArrayWithFirstArrayElement = (path) => {
+    const {elements} = path.node;
+    
+    if (!isStringAndString(elements))
+        return false;
+    
+    return isParentIsArrayWithFirstArrayElement(path);
+};
+const isLotsOfElementsFirstNotObject = (path) => {
+    const {elements} = path.node;
+    const [first] = elements;
+    
+    return elements.length > 3 && !isObjectExpression(first);
+};
+
+const isTwoSimplesInsideObjectProperty = (path) => {
+    const {node, parentPath} = path;
+    
+    const {elements} = node;
+    const {length} = elements;
+    const [a, b] = elements;
+    
+    if (length > 2)
+        return false;
+    
+    if (!parentPath.isObjectProperty())
+        return false;
+    
+    if (!isStringLiteral(a) || !isStringLiteral(b))
+        return false;
+    
+    return !isCoupleLines(path);
+};
 
 const {
     isObjectExpression,
@@ -12,6 +45,7 @@ const {
     isNullLiteral,
     isStringLiteral,
     isSpreadElement,
+    isNumericLiteral,
 } = require('@putout/babel').types;
 
 const {
@@ -22,7 +56,6 @@ const {
     isStringAndArray,
     isIdentifierAndIdentifier,
     satisfy,
-
 } = require('../../is');
 
 const {round} = Math;
@@ -49,7 +82,7 @@ const isSimpleAndObject = ([a, b]) => isSimple(a) && isObjectExpression(b);
 const ONE_LINE = false;
 const MULTI_LINE = true;
 
-const isOneLine = satisfy([
+const isOneLineElements = satisfy([
     isOneSimple,
     isOneSpread,
     isIdentifierAndIdentifier,
@@ -64,37 +97,48 @@ const isOneLine = satisfy([
     isSimpleAndObject,
 ]);
 
+const isOneLinePath = satisfy([
+    isCallInsideArrow,
+    notIncreaseIndent,
+    isInsideLoop,
+    isTwoSimplesInsideObjectProperty,
+    isTwoStringsTupleAndParentIsArrayWithFirstArrayElement,
+]);
+
+const isMultiLinePath = satisfy([
+    tooLong,
+    isCoupleLines,
+    notNumbersInsideForOf,
+]);
+
 module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
-    if (elements.length > 3 && !isObjectExpression(elements[0]))
+    if (isLotsOfElementsFirstNotObject(path))
         return MULTI_LINE;
     
-    if (isOneLine(elements))
+    if (isOneLineElements(elements))
         return ONE_LINE;
     
-    if (isCallInsideArrow(path))
-        return ONE_LINE;
-    
-    if (notIncreaseIndent(path))
-        return ONE_LINE;
-    
-    if (isInsideLoop(path))
+    if (isOneLinePath(path))
         return ONE_LINE;
     
     if (isShortTwoSimplesInsideCall(path, maxElementsInOneLine))
         return ONE_LINE;
     
-    if (isTwoSimplesInsideObjectProperty(path))
-        return ONE_LINE;
-    
-    if (isStringAndString(elements) && isParentIsArrayWithFirstArrayElement(path))
-        return ONE_LINE;
-    
-    if (tooLong(path) || isCoupleLines(path) || !isNumbers(elements) && !isForOf(path) && isLastArg(path) && !isParentProperty(path))
+    if (isMultiLinePath(path))
         return MULTI_LINE;
     
     return ONE_LINE;
 };
 
+function notNumbersInsideForOf(path) {
+    const {elements} = path.node;
+    
+    if (isNumbers(elements))
+        return false;
+    
+    return !isForOf(path) && isLastArg(path) && !isParentProperty(path);
+}
+
 const isParentIsArrayWithFirstArrayElement = ({parentPath}) => {
     if (!isArrayExpression(parentPath))
         return false;
@@ -124,25 +168,6 @@ const isShortTwoSimplesInsideCall = (path, short) => {
     return length < short;
 };
 
-const isTwoSimplesInsideObjectProperty = (path) => {
-    const {node, parentPath} = path;
-    
-    const {elements} = node;
-    const {length} = elements;
-    const [a, b] = elements;
-    
-    if (length > 2)
-        return false;
-    
-    if (!parentPath.isObjectProperty())
-        return false;
-    
-    if (!isStringLiteral(a) || !isStringLiteral(b))
-        return false;
-    
-    return !isCoupleLines(path);
-};
-
 function isOneSimple(elements) {
     if (elements.length !== 1)
         return false;
@@ -211,7 +236,7 @@ function isCallInsideArrow(path) {
 
 function isNumbers(elements) {
     for (const element of elements) {
-        if (element.isNumericLiteral())
+        if (isNumericLiteral(element))
             return true;
     }
     
@@ -266,3 +291,4 @@ module.exports.isCurrentNewLine = (path) => {
     
     return !path.isObjectExpression();
 };
+

package/package.json

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