@putout/printer 1.148.1 → 1.150.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.09, v1.150.0
+
+feature:
+- c5b6238 @putout/printer: ArrayExpression: Tuple: two strings used as argument
+
+2023.06.09, v1.149.0
+
+feature:
+- 35ec229 @putout/printer: ArrayExpression: plugins: couple lines
+
 2023.06.08, v1.148.1
 
 feature:

package/lib/tokenize/expressions/{array-expression.js → array-expression/array-expression.js}

@@ -21,10 +21,13 @@ const {
     isStringAndIdentifier,
     isIdentifierAndString,
     isStringAndMember,
-} = require('../is');
+} = require('../../is');
+const MAX_ARRAY_ELEMENTS_WHEN_USED_AS_ARGUMENT = 4;
 
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 
+const isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
+
 const isStringAndArray = ([a, b]) => {
     if (!isStringLiteral(a))
         return false;
@@ -34,7 +37,22 @@ const isStringAndArray = ([a, b]) => {
     
     return !isStringAndIdentifier(b.node.elements);
 };
+
 const isStringAndString = ([a, b]) => isStringLiteral(a) && isStringLiteral(b);
+const isShortTwoSimplesInsideCall = (path, short) => {
+    const {node, parentPath} = path;
+    const {elements} = node;
+    const {length} = elements;
+    const [a, b] = elements;
+    
+    if (!parentPath.isCallExpression())
+        return false;
+    
+    if (!isSimple(a) || !isSimple(b))
+        return false;
+    
+    return length < short;
+};
 const isIdentifierAndIdentifier = ([a, b]) => isIdentifier(a) && isIdentifier(b);
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
 
@@ -48,7 +66,6 @@ const isSimpleAndCall = ([a, b]) => {
 const isBooleanAndSimple = ([a, b]) => isBooleanLiteral(a) && isSimple(b);
 const isNullAndSimple = ([a, b]) => isNullLiteral(a) && isSimple(b);
 const isSimpleAndObject = ([a, b]) => isSimple(a) && isObjectExpression(b);
-
 const isStringAndObject = (elements) => {
     const first = elements.at(0);
     const last = elements.at(-1);
@@ -79,7 +96,7 @@ module.exports.ArrayExpression = {
         if (isCoupleLines(parentPath))
             return false;
         
-        if (isStringAndIdentifier(elements))
+        if (isStringAndIdentifier(elements) && isInsideOneElementArray(path))
             return true;
         
         return isIdentifierAndIdentifier(elements);
@@ -141,7 +158,7 @@ module.exports.ArrayExpression = {
         if (isCoupleLines(parentPath))
             return false;
         
-        if (isStringAndIdentifier(elements))
+        if (isStringAndIdentifier(elements) && isInsideOneElementArray(path))
             return true;
         
         return isIdentifierAndIdentifier(elements);
@@ -162,16 +179,8 @@ function isNumbers(elements) {
     return false;
 }
 
-function isLastArg(path) {
-    const {parentPath} = path;
-    
-    if (!parentPath.isCallExpression())
-        return true;
-    
-    const args = parentPath.get('arguments');
-    const n = args.length - 1;
-    
-    return path === args[n];
+function isLastArg({parentPath}) {
+    return !parentPath.isCallExpression();
 }
 
 function isParentProperty(path) {
@@ -270,6 +279,9 @@ function isNewlineBetweenElements(path, {elements}) {
     if (isSimpleAndCall(elements))
         return false;
     
+    if (isShortTwoSimplesInsideCall(path, MAX_ARRAY_ELEMENTS_WHEN_USED_AS_ARGUMENT))
+        return false;
+    
     if (isTwoStringsDifferentLength(elements))
         return false;
     
@@ -338,3 +350,4 @@ const isOneElementCall = (path, {elements}) => {
     
     return !isCallExpression(elements[0]);
 };
+

package/lib/tokenize/expressions/index.js

@@ -28,7 +28,7 @@ const {
 } = require('./class-property');
 
 const {AssignmentExpression} = require('./assignment-expression');
-const {ArrayExpression} = require('./array-expression');
+const {ArrayExpression} = require('./array-expression/array-expression');
 const {ArrayPattern} = require('./array-pattern');
 const {AssignmentPattern} = require('./assignment-pattern');
 const {RestElement} = require('./rest-element');

package/package.json

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