@putout/printer 2.13.0 → 2.14.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.14, v2.14.0
+
+feature:
+- 0f3dbaf @putout/printer: ArrayExpression: no newline when one element with type SpreadElement
+
+2023.06.14, v2.13.1
+
+fix:
+- ed8870a ArrayExpression
+
 2023.06.13, v2.13.0
 
 feature:

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

@@ -21,10 +21,7 @@ const isTwoLongStrings = ([a, b]) => {
     if (!a?.isStringLiteral() || !b?.isStringLiteral())
         return false;
     
-    if (a.node.value.length > LONG_STRING)
-        return true;
-    
-    return false;
+    return a.node.value.length > LONG_STRING;
 };
 
 module.exports.ArrayExpression = {

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

@@ -11,6 +11,7 @@ const {
     isBooleanLiteral,
     isNullLiteral,
     isStringLiteral,
+    isSpreadElement,
 } = require('@babel/types');
 
 const {
@@ -24,6 +25,15 @@ const {
 
 const {round} = Math;
 
+const isOneSpread = (elements) => {
+    if (elements.length > 1)
+        return false;
+    
+    const [first] = elements;
+    
+    return isSpreadElement(first);
+};
+
 const isSimpleAndCall = ([a, b]) => {
     if (!isSimple(a))
         return;
@@ -44,6 +54,9 @@ module.exports.isNewlineBetweenElements = (path, {elements, maxElementsInOneLine
     if (isOneSimple(path))
         return ONE_LINE;
     
+    if (isOneSpread(elements))
+        return ONE_LINE;
+    
     if (elements.length === 2 && isIdentifierAndIdentifier(elements))
         return ONE_LINE;
     
@@ -157,10 +170,7 @@ function isTwoStringsDifferentLength(strings) {
 }
 
 function isInsideLoop(path) {
-    if (!path.parentPath.isForOfStatement())
-        return false;
-    
-    return true;
+    return path.parentPath.isForOfStatement();
 }
 
 function tooLong(path) {
@@ -219,20 +229,14 @@ function isIncreaseIndent(path) {
     if (elements[0].isObjectExpression())
         return true;
     
-    if (isStringAndObject(elements))
-        return true;
-    
-    return false;
+    return isStringAndObject(elements);
 }
 
 function isInsideCallLoop(path) {
     if (!path.parentPath.isCallExpression())
         return false;
     
-    if (!path.parentPath.parentPath.isForOfStatement())
-        return false;
-    
-    return true;
+    return path.parentPath.parentPath.isForOfStatement();
 }
 
 const isStringAndObject = (elements) => {

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

@@ -10,10 +10,7 @@ const isStringLike = (a) => {
     if (isStringLiteral(a))
         return true;
     
-    if (isTemplateLiteral(a))
-        return true;
-    
-    return false;
+    return isTemplateLiteral(a);
 };
 
 module.exports.isConcatenation = (path) => {

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

@@ -132,8 +132,5 @@ function isParens(path) {
     if (isBodyOfArrow(path))
         return true;
     
-    if (isParentExpression(path))
-        return true;
-    
-    return false;
+    return isParentExpression(path);
 }

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

@@ -128,8 +128,5 @@ function shouldAddNewline(path) {
     if (!isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties))
         return true;
     
-    if (parentPath.isObjectProperty())
-        return true;
-    
-    return false;
+    return parentPath.isObjectProperty();
 }

package/lib/tokenize/statements/block-statement/block-statement.js

@@ -79,10 +79,7 @@ function shouldAddNewlineAfter(path) {
     if (isLast(path))
         return false;
     
-    if (isNextIfAlternate(path))
-        return false;
-    
-    return true;
+    return !isNextIfAlternate(path);
 }
 
 function isNextIfAlternate(path) {
@@ -103,8 +100,5 @@ function isTry({parentPath}) {
     if (parentPath.isTryStatement())
         return true;
     
-    if (parentPath.parentPath?.isTryStatement())
-        return true;
-    
-    return false;
+    return parentPath.parentPath?.isTryStatement();
 }

package/lib/tokenize/statements/export-declaration/export-default-declaration.js

@@ -13,10 +13,7 @@ function shouldAddSemi(path) {
     if (path.isClassDeclaration())
         return false;
     
-    if (path.isFunctionDeclaration())
-        return false;
-    
-    return true;
+    return !path.isFunctionDeclaration();
 }
 
 module.exports.ExportDefaultDeclaration = {

package/lib/tokenize/statements/expression-statement.js

@@ -57,10 +57,7 @@ module.exports.ExpressionStatement = {
         if (hasTrailingComment(path) && isLast(path))
             return true;
         
-        if (isBeforeElse(path))
-            return true;
-        
-        return false;
+        return isBeforeElse(path);
     },
     after(path, {print, maybe, store}) {
         if (hasTrailingComment(path) && isLast(path) && isCoupleLines(path)) {

package/lib/tokenize/statements/for-of-statement.js

@@ -55,12 +55,7 @@ module.exports.ForOfStatement = {
         
         maybe.markAfter(isMarkedAfter(bodyPath), path);
     },
-    afterIf: (path) => {
-        if (isNext(path))
-            return true;
-        
-        return false;
-    },
+    afterIf: (path) => isNext(path),
     after(path, {print}) {
         print.linebreak();
         markAfter(path);

package/lib/tokenize/statements/if-statement/if-statement.js

@@ -57,10 +57,7 @@ module.exports.IfStatement = {
         if (!exists(next))
             return false;
         
-        if (next.isReturnStatement())
-            return false;
-        
-        return true;
+        return !next.isReturnStatement();
     },
     after: (path, {print}) => {
         print.linebreak();

package/lib/tokenize/statements/import-declaration/import-declaration.js

@@ -96,10 +96,7 @@ module.exports.ImportDeclaration = {
         if (isLast(path))
             return false;
         
-        if (path.getNextSibling().isImportDeclaration())
-            return false;
-        
-        return true;
+        return !path.getNextSibling().isImportDeclaration();
     },
     after(path, {print}) {
         print.newline();

package/lib/tokenize/statements/variable-declaration/variable-declaration.js

@@ -149,10 +149,7 @@ function shouldAddNewlineBefore(path) {
     if (prevPath.isStatement() && !prevPath.isExpressionStatement() && !prevPath.isBlockStatement())
         return false;
     
-    if (!isExportDeclaration(path.parentPath) && isCoupleLines(path))
-        return true;
-    
-    return false;
+    return !isExportDeclaration(path.parentPath) && isCoupleLines(path);
 }
 
 function isFirst(path) {

package/lib/tokenize/statements/while-statement.js

@@ -20,10 +20,7 @@ module.exports.WhileStatement = {
         }
     },
     afterIf(path) {
-        if (isLast(path))
-            return false;
-        
-        return true;
+        return !isLast(path);
     },
     after(path, {print}) {
         print.linebreak();

package/lib/tokenize/typescript/ts-type-alias-declaration.js

@@ -29,10 +29,7 @@ module.exports.TSTypeAliasDeclaration = {
         if (last)
             return false;
         
-        if (isNextType(path))
-            return false;
-        
-        return true;
+        return !isNextType(path);
     },
     after(path, {print}) {
         print.newline();

package/lib/tokenize/typescript/ts-type-literal.js

@@ -33,8 +33,5 @@ module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
 function isNewline(path) {
     const members = path.get('members');
     
-    if (members.length && members[0].node.typeAnnotation)
-        return true;
-    
-    return false;
+    return members.length && members[0].node.typeAnnotation;
 }

package/package.json

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