@putout/printer 8.2.0 → 8.4.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.02.15, v8.4.0
+
+feature:
+- 1b6c4d1 @putout/printer: ArrayExpression: improve support
+
+2024.02.14, v8.3.0
+
+feature:
+- 788739f @putout/printer: SwitchStatement: improve indent
+
 2024.02.12, v8.2.0
 
 feature:

package/lib/tokenize/comment/parse-leading-comments.js

@@ -88,9 +88,8 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
             
             print(`//${value}`);
             
-            const isParentSwitch = path.parentPath.isSwitchCase();
-            maybe.print.breakline(propIs || isParentSwitch);
-            maybe.print.newline(!propIs && !isParentSwitch);
+            maybe.print.breakline(propIs);
+            maybe.print.newline(!propIs);
             continue;
         }
         

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

@@ -1,5 +1,6 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isCoupleLines,
     isStringAndIdentifier,
@@ -19,12 +20,13 @@ const {
     isArrayIndented,
 } = require('./indent');
 
-const {types} = require('@putout/babel');
 const {
     isObjectExpression,
     isSpreadElement,
+    isStringLiteral,
 } = types;
 
+const isNextString = (path) => isStringLiteral(path.getNextSibling());
 const isNextObject = (a) => a.getNextSibling().isObjectExpression();
 const isPrevObject = (a) => a.getPrevSibling().isObjectExpression();
 const isObjectAfterSpread = (a) => isSpreadElement(a) && isNextObject(a) && !isPrevObject(a);
@@ -98,9 +100,9 @@ module.exports.ArrayExpression = {
         const parentElements = path.parentPath.get('elements');
         
         if (isInsideArray(path) && isStringAndArray(parentElements)) {
-            indent.dec();
+            maybe.indent.dec(!isNextString(path));
             maybe.indent(elements.length && isNewLine);
-            indent.inc();
+            maybe.indent.inc(!isNextString(path));
         } else if (!isArrayInsideArray(path) && !isObjectExpression(elements.at(-1))) {
             maybe.indent(elements.length && isNewLine);
         }
@@ -128,3 +130,4 @@ module.exports.ArrayExpression = {
         indent.inc();
     },
 };
+

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

@@ -1,10 +1,13 @@
 'use strict';
 
 const {types} = require('@putout/babel');
-const {isStringLiteral} = types;
-
 const {isIndented} = require('../../is');
 
+const {
+    isStringLiteral,
+    isArrayExpression,
+} = types;
+
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
 
 module.exports.isInsideArray = isInsideArray;
@@ -26,7 +29,14 @@ function isArrayInsideArray(path) {
     if (!path.isArrayExpression() || !path.parentPath.isArrayExpression())
         return false;
     
-    return path.parentPath.node.elements.length <= 3;
+    const parentElements = path.parentPath.node.elements;
+    const parentHasArrays = parentElements.filter(isArrayExpression).length;
+    const lastIsArray = !isArrayExpression(parentElements.at(-1));
+    
+    if (parentHasArrays && lastIsArray)
+        return false;
+    
+    return parentElements.length <= 3;
 }
 
 const isTwoLongStrings = ([a, b]) => {

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

@@ -96,7 +96,7 @@ module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
     if (isTwoSimplesInsideObjectProperty(path))
         return ONE_LINE;
     
-    if (isStringAndArray(elements))
+    if (isStringAndArray(elements) && elements.length < 3)
         return ONE_LINE;
     
     if (isStringAndMember(elements))

package/lib/tokenize/is.js

@@ -65,12 +65,7 @@ module.exports.isIdentifierAndIdentifier = ([a, b]) => {
 };
 module.exports.isStringAndMember = ([a, b]) => isStringLiteral(a) && isMemberExpression(b);
 module.exports.isIdentifierAndString = ([a, b]) => isIdentifier(a) && isStringLiteral(b);
-module.exports.isStringAndArray = (array) => {
-    if (array.length > 2)
-        return false;
-    
-    const [a, b] = array;
-    
+module.exports.isStringAndArray = ([a, b]) => {
     if (!isStringLiteral(a))
         return false;
     

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

@@ -45,7 +45,6 @@ module.exports.SwitchStatement = {
             print(':');
             
             const consequents = switchCase.get('consequent');
-            
             const isBlock = switchCase.get('consequent.0')?.isBlockStatement();
             
             maybe.indent.inc(!isBlock);

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

@@ -18,7 +18,7 @@ const {maybeDeclare} = require('../../maybe/maybe-declare');
 
 const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
-const isInsideBlock = (path) => /^(Program|BlockStatement|TSModuleBlock)$/.test(path.parentPath.type);
+const isInsideBlock = (path) => /^(Program|BlockStatement|TSModuleBlock|SwitchCase)$/.test(path.parentPath.type);
 const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
 const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
 const isParentIf = (path) => path.parentPath.isIfStatement();
@@ -83,7 +83,8 @@ module.exports.VariableDeclaration = {
             write.newline();
             wasNewline = true;
         } else if (isParentSwitchCase(path)) {
-            write.breakline();
+            //write.breakline();
+            write.newline();
         }
         
         if (isParentBlock(path) && isNext(path) && (noTrailingComment(path) || isNewlineBetweenSiblings(path))) {

package/package.json

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