@putout/printer 1.21.0 → 1.23.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.04.05, v1.23.0
+
+feature:
+- 316c0f6 @putout/printer: add support of ExpressionStatement parent of ObjectExpression
+
+2023.04.04, v1.22.0
+
+feature:
+- c8fc7b7 @putout/printer: improve support of tuples
+- 599bd93 @putout/printer: set @putout/printer as putout printer
+
 2023.04.04, v1.21.0
 
 feature:

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

@@ -8,6 +8,7 @@ const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 const SECOND = 1;
 
 const isStringAndArray = ([a, b]) => a?.isStringLiteral() && b?.isArrayExpression();
+const isStringAndIdentifier = ([a, b]) => a?.isStringLiteral() && b?.isIdentifier();
 const isArrayParent = (path) => path.parentPath.isArrayExpression();
 const isTwoLongStrings = ([a, b]) => {
     const LONG_STRING = 20;
@@ -27,9 +28,8 @@ module.exports.ArrayExpression = (path, {print, maybe, indent}) => {
     
     print('[');
     
-    if (!isTwoLongStrings(elements) && !shouldIncreaseIndent) {
-        indent.inc();
-    }
+    if (!isTwoLongStrings(elements))
+        maybe.indent.inc(!shouldIncreaseIndent);
     
     const isNewLine = isNewlineBetweenElements(path, {elements});
     const n = elements.length - 1;
@@ -133,13 +133,21 @@ function isNewlineBetweenElements(path, {elements}) {
     if (isStringAndArray(elements))
         return false;
     
+    if (isStringAndIdentifier(elements))
+        return false;
+    
     if (tooLong(path) || isCoupleLines(path) || !isNumbers(elements) && !isForOf(path) && isLastArg(path) && !isParentProperty(path))
         return true;
     
     return false;
 }
 
-function isTwoStringsDifferentLength([a, b]) {
+function isTwoStringsDifferentLength(strings) {
+    const [a, b] = strings;
+    
+    if (strings.length > 2)
+        return false;
+    
     if (!a?.isStringLiteral() || !b?.isStringLiteral())
         return false;
     

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

@@ -6,7 +6,6 @@ module.exports.ArrayPattern = (path, {indent, maybe, print}) => {
     print('[');
     
     const elements = path.get('elements');
-    
     indent.inc();
     
     const isNewLine = !isForOf(path) && elements.length > 2;

package/lib/tokenize/expressions/class.js

@@ -5,6 +5,7 @@ module.exports.ClassDeclaration = classVisitor;
 
 module.exports.ClassDeclaration = (path, {print, indent}) => {
     indent();
+    
     classVisitor(path, {
         print,
         indent,

package/lib/tokenize/expressions/functions.js

@@ -16,7 +16,6 @@ module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
     maybe.print(generator, '*');
     
     const id = path.get('id');
-    
     write.space();
     
     if (id.node) {

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

@@ -6,7 +6,6 @@ module.exports.NewExpression = (path, {indent, print, maybe}) => {
     print('__callee');
     
     const args = path.get('arguments');
-    
     print('(');
     
     const n = args.length - 1;

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

@@ -5,6 +5,7 @@ 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 isIf = (path) => path.parentPath.parentPath.isIfStatement();
+const isParentExpression = (path) => path.parentPath.isExpressionStatement();
 
 const isForOf = (path) => {
     if (path.parentPath.isForOfStatement())
@@ -18,7 +19,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     
     const properties = path.get('properties');
     const {length} = properties;
-    const parens = isBodyOfArrow(path);
+    const parens = isParens(path);
     const manyLines = !isOneLine(path);
     
     maybe.print(parens, '(');
@@ -62,7 +63,6 @@ function shouldAddNewline(path) {
     
     return path.parentPath.parentPath.isSpreadElement();
 }
-
 module.exports.ObjectProperty = (path, {print, maybe}) => {
     const {
         shorthand,
@@ -103,3 +103,13 @@ function isOneLine(path) {
     
     return !isValue(path);
 }
+
+function isParens(path) {
+    if (isBodyOfArrow(path))
+        return true;
+    
+    if (isParentExpression(path))
+        return true;
+    
+    return false;
+}

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

@@ -85,4 +85,3 @@ function isStrictMode(path) {
     
     return value === 'use strict';
 }
-

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

@@ -52,4 +52,3 @@ module.exports.ForOfStatement = {
         markAfter(path);
     },
 };
-

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

@@ -48,9 +48,6 @@ module.exports.IfStatement = {
             traverse(alternate);
             indent.dec();
         }
-        
-        //if (shouldAddNewline(path))
-        //print.newline();
     },
     afterIf: (path) => {
         const next = path.getNextSibling();

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

@@ -18,7 +18,6 @@ module.exports.SwitchStatement = (path, {print, maybe}) => {
         print(':');
         
         const isBlock = switchCase.get('consequent.0').isBlockStatement();
-        
         maybe.indent.inc(!isBlock);
         maybe.print.newline(!isBlock);
         

package/lib/tokenize/statements/try-statements.js

@@ -17,7 +17,6 @@ module.exports.TryStatement = (path, {print, maybe}) => {
     }
     
     print.newline();
-    
     maybe.print.breakline(isNext(path));
 };
 

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

@@ -23,7 +23,6 @@ module.exports.VariableDeclaration = {
         print('__declarations.0.id');
         
         const initPath = path.get('declarations.0.init');
-        
         maybe.print(initPath.node, ' = ');
         print('__declarations.0.init');
         maybe.print(isParentBlock(path), ';');

package/lib/tokenize/tokenize.js

@@ -243,4 +243,3 @@ const computePath = (path, maybeLine) => {
     
     return maybeLine;
 };
-

package/lib/tokenize/typescript/index.js

@@ -59,6 +59,7 @@ module.exports = {
         write('{');
         write.newline();
         indent.inc();
+        
         for (const member of path.get('members')) {
             indent();
             traverse(member);
@@ -78,4 +79,3 @@ module.exports = {
         print('__typeAnnotation');
     },
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.21.0",
+  "version": "1.23.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",