@putout/printer 1.49.0 → 1.50.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.04.14, v1.50.0
+
+fix:
+- 6203f72 @putout/printer: ArrayExpression: one element CallExpression
+
+feature:
+- 491126f @putout/printer: ArrayExpression: two elements ReturnStatement: no newline
+
+2023.04.14, v1.49.1
+
+fix:
+- 378734f @putout/printer: newline inside in ObjectPattern inside ForOfStatement
+
 2023.04.14, v1.49.0
 
 fix:

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

@@ -21,6 +21,9 @@ const isStringAndString = ([a, b]) => isStringLiteral(a) && isStringLiteral(b);
 const isIdentifierAndIdentifier = ([a, b]) => isIdentifier(a) && isIdentifier(b);
 const isArrayParent = (path) => path.parentPath.isArrayExpression();
 
+const isOneElementCall = (path, {elements}) => path.parentPath.isCallExpression() && elements.length === 1;
+const isTwoElementReturn = (path, {elements}) => path.parentPath.isReturnStatement() && elements.length === 2;
+
 const isTwoLongStrings = ([a, b]) => {
     const LONG_STRING = 20;
     
@@ -172,10 +175,13 @@ function tooLong(path) {
 }
 
 function isNewlineBetweenElements(path, {elements}) {
-    if (isIncreaseIndent(path))
+    if (isTwoElementReturn(path, {elements}))
         return false;
     
-    if (isInsideCallLoop(path))
+    if (isOneElementCall(path, {elements}))
+        return false;
+    
+    if (isIncreaseIndent(path))
         return false;
     
     if (isInsideLoop(path))

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

@@ -1,29 +1,18 @@
 'use strict';
 
-const {isCoupleLines} = require('../is');
-
 const {
-    isFunction,
-    isIfStatement,
-    isStatement,
-} = require('@babel/types');
+    isCoupleLines,
+    isForOf,
+    isIf,
+} = require('../is');
+
+const {isFunction} = require('@babel/types');
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
 const isValue = (path) => path.get('properties.0.value').node;
-const isIfOrStatement = (a) => isIfStatement(a) || isStatement(a);
-const isIf = (path) => isIfStatement(path.find(
-    isIfOrStatement,
-));
 const isParentExpression = (path) => path.parentPath.isExpressionStatement();
 
-const isForOf = (path) => {
-    if (path.parentPath.isForOfStatement())
-        return true;
-    
-    return path.parentPath?.parentPath?.isForOfStatement();
-};
-
 module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     indent.inc();
     

package/lib/tokenize/expressions/object-pattern.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {isIdentifier} = require('@babel/types');
-const isForOf = (path) => path.parentPath?.parentPath?.parentPath?.isForOfStatement();
+const {isForOf} = require('../is');
 
 module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
     indent.inc();

package/lib/tokenize/is.js

@@ -5,6 +5,10 @@ const {isMarkedAfter} = require('./mark');
 const {
     isStringLiteral,
     isIdentifier,
+    isIfStatement,
+    isStatement,
+    isForOfStatement,
+    isVariableDeclaration,
 } = require('@babel/types');
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
@@ -48,3 +52,22 @@ function isNextCoupleLines(path) {
     return isCoupleLines(path.getNextSibling());
 }
 module.exports.isStringAndIdentifier = ([a, b]) => isStringLiteral(a) && isIdentifier(b);
+
+const isIfOrStatement = (a) => isIfStatement(a) || isStatement(a);
+const isForOfOrStatement = (a) => isForOfStatement(a) || isStatement(a);
+
+module.exports.isIf = (path) => isIfStatement(path.find(
+    isIfOrStatement,
+));
+
+module.exports.isForOf = (path) => {
+    const current = path.find(isForOfOrStatement);
+    
+    if (isForOfStatement(current))
+        return true;
+    
+    if (isVariableDeclaration(current))
+        return isForOfStatement(current.parentPath);
+    
+    return false;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.49.0",
+  "version": "1.50.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",