@putout/printer 2.30.0 → 2.32.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.19, v2.32.0
+
+feature:
+- 1e478d1 @putout/printer: VariableDeclarator: useless newline
+
+2023.06.19, v2.31.0
+
+feature:
+- bfb0901 @putout/printer: ArrayExpression: newlines
+
 2023.06.19, v2.30.0
 
 feature:

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

@@ -5,6 +5,7 @@ const {
     isStringAndIdentifier,
     isIdentifierAndIdentifier,
     isStringAndArray,
+    isIndented,
 } = require('../../is');
 
 const {
@@ -13,7 +14,10 @@ const {
     isCurrentNewLine,
 } = require('./new-line');
 
-const {isObjectExpression} = require('@babel/types');
+const {
+    isObjectExpression,
+    isStringLiteral,
+} = require('@babel/types');
 
 const isNextObject = (a) => a.getNextSibling().isObjectExpression();
 
@@ -23,7 +27,7 @@ const isInsideArray = (path) => path.parentPath.isArrayExpression();
 const isTwoLongStrings = ([a, b]) => {
     const LONG_STRING = 20;
     
-    if (!a?.isStringLiteral() || !b?.isStringLiteral())
+    if (!isStringLiteral(a) || !isStringLiteral(b))
         return false;
     
     return a.node.value.length > LONG_STRING;
@@ -55,8 +59,11 @@ module.exports.ArrayExpression = {
         
         print('[');
         
-        if (!isTwoLongStrings(elements))
+        const indented = !isTwoLongStrings(elements) || !isInsideArray(path) && isIndented(elements[0]);
+        
+        if (indented) {
             maybe.indent.inc(shouldIncreaseIndent);
+        }
         
         const isNewLine = isNewlineBetweenElements(path, {
             elements,
@@ -81,9 +88,8 @@ module.exports.ArrayExpression = {
             }
         }
         
-        if (!isTwoLongStrings(elements)) {
+        if (indented)
             maybe.indent.dec(shouldIncreaseIndent);
-        }
         
         const parentElements = path.parentPath.get('elements');
         

package/lib/tokenize/is.js

@@ -34,6 +34,11 @@ module.exports.isParentProgram = isParentProgram;
 module.exports.isParentBlock = isParentBlock;
 module.exports.isLast = isLast;
 module.exports.isParentLast = (path) => isLast(path.parentPath);
+
+module.exports.isIndented = (path = {}) => {
+    const {parentPath, node} = path;
+    return node.loc.start.column !== parentPath.node.loc.start.column;
+};
 module.exports.isCoupleLines = isCoupleLines;
 
 function isCoupleLines(path) {

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

@@ -123,6 +123,12 @@ function notLastPrevVarNotNextVar(path) {
     const prev = path.getPrevSibling();
     const next = path.getNextSibling();
     
+    if (!exists(prev.getPrevSibling()))
+        return false;
+    
+    if (path.node.loc?.start.line === prev.node?.loc?.start.line + 2)
+        return false;
+    
     return !isLast(path) && prev.isVariableDeclaration() && !next.isVariableDeclaration();
 }
 

package/package.json

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