@putout/printer 6.11.2 → 6.11.4

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.12.01, v6.11.4
+
+feature:
+- d181e1c @putout/printer: ArrayExpression: notNumbersInsideForOf
+
+2023.12.01, v6.11.3
+
+feature:
+- f363754 ArrayExpression: isOneLine
+
 2023.12.01, v6.11.2
 
 feature:

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

@@ -12,6 +12,7 @@ const {
     isNullLiteral,
     isStringLiteral,
     isSpreadElement,
+    isNumericLiteral,
 } = require('@putout/babel').types;
 
 const {
@@ -21,6 +22,7 @@ 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,48 +80,33 @@ 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;
     
-    if (tooLong(path) || isCoupleLines(path) || !isNumbers(elements) && !isForOf(path) && isLastArg(path) && !isParentProperty(path))
+    if (tooLong(path) || isCoupleLines(path))
+        return MULTI_LINE;
+    
+    if (notNumbersInsideForOf(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;
@@ -159,9 +155,7 @@ const isTwoSimplesInsideObjectProperty = (path) => {
     return !isCoupleLines(path);
 };
 
-function isOneSimple(path) {
-    const elements = path.get('elements');
-    
+function isOneSimple(elements) {
     if (elements.length !== 1)
         return false;
     
@@ -229,7 +223,7 @@ function isCallInsideArrow(path) {
 
 function isNumbers(elements) {
     for (const element of elements) {
-        if (element.isNumericLiteral())
+        if (isNumericLiteral(element))
             return true;
     }
     

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.2",
+  "version": "6.11.4",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",