@putout/printer 1.147.0 → 1.148.1

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.06.08, v1.148.1
+
+feature:
+- fe4b8f0 @putout/printer: ArrayExpression: plugins
+
+2023.06.08, v1.148.0
+
+fix:
+- 26795a8 @putout/printer: BinaryExpression: Strings
+
+feature:
+- 55cb78d @putout/printer: ArrayExpression: plugins
+
 2023.06.08, v1.146.0
 
 feature:

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

@@ -11,6 +11,7 @@ const {
     isBooleanLiteral,
     isNullLiteral,
     isObjectExpression,
+    isAwaitExpression,
 } = require('@babel/types');
 
 const {isSimple} = require('@putout/operate');
@@ -24,11 +25,26 @@ const {
 
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 
-const isStringAndArray = ([a, b]) => isStringLiteral(a) && isArrayExpression(b);
+const isStringAndArray = ([a, b]) => {
+    if (!isStringLiteral(a))
+        return false;
+    
+    if (!isArrayExpression(b))
+        return false;
+    
+    return !isStringAndIdentifier(b.node.elements);
+};
 const isStringAndString = ([a, b]) => isStringLiteral(a) && isStringLiteral(b);
 const isIdentifierAndIdentifier = ([a, b]) => isIdentifier(a) && isIdentifier(b);
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
-const isSimpleAndCall = ([a, b]) => isSimple(a) && isCallExpression(b);
+
+const isSimpleAndCall = ([a, b]) => {
+    if (!isSimple(a))
+        return;
+    
+    return isCallExpression(b) || isAwaitExpression(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);

package/lib/tokenize/expressions/binary-expression/concatanate.js

@@ -6,8 +6,6 @@ const {
     isBinaryExpression,
 } = require('@babel/types');
 
-const isBinary = (a) => isBinaryExpression(a);
-
 const isStringLike = (a) => {
     if (isStringLiteral(a))
         return true;
@@ -20,23 +18,24 @@ const isStringLike = (a) => {
 
 module.exports.isConcatenation = (path) => {
     const {parentPath} = path;
+    const {operator} = path.node;
     
-    const {
-        operator,
-        left,
-        right,
-    } = path.node;
+    const startLine = path.node.loc?.start.line;
+    const endLine = path.node.loc?.end.line;
     
-    if (operator !== '+')
+    if (startLine === endLine)
         return false;
     
-    if (isStringLike(left) && isStringLike(right) && isBinary(parentPath))
-        return true;
+    const left = path.get('left');
+    const right = path.get('right');
     
-    if (isBinary(left) && isStringLike(right))
+    if (operator !== '+')
+        return false;
+    
+    if (isStringLike(left) && isStringLike(right) && isBinaryExpression(parentPath))
         return true;
     
-    return false;
+    return isBinaryExpression(left) && isStringLike(right);
 };
 
 module.exports.concatanate = (path, {print, indent}) => {

package/package.json

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