@putout/printer 8.46.0 → 8.48.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.06.07, v8.48.0
+
+feature:
+- 715d6f3 @putout/printer: TryStatement: add support of format: space (#15)
+
+2024.06.06, v8.47.0
+
+feature:
+- 53c7909 @putout/printer: ArrayExpression: comma (coderaiser/putout#206)
+
 2024.06.06, v8.46.0
 
 feature:

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

@@ -6,7 +6,7 @@ const {
     isStringAndIdentifier,
     isIdentifierAndIdentifier,
     isStringAndArray,
-    isSimpleAndEmptyObject,
+    isSimpleAndNotEmptyObject,
     isNextObject,
 } = require('../../is');
 
@@ -29,6 +29,7 @@ const {
     isSpreadElement,
     isStringLiteral,
     isIdentifier,
+    isFunction,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
@@ -44,6 +45,15 @@ const isSpreadBeforeObject = (a) => {
     if (!prev.isSpreadElement())
         return false;
     
+    const argCall = prev.get('argument');
+    
+    if (argCall.isCallExpression()) {
+        const [first] = argCall.get('arguments');
+        
+        if (isFunction(first))
+            return false;
+    }
+    
     if (prev.getPrevSibling().isObjectExpression())
         return false;
     
@@ -158,7 +168,7 @@ module.exports.ArrayExpression = {
             maybe.indent(elements.length && isNewLine);
         }
         
-        if (isSimpleAndEmptyObject(elements) && !isSpreadElement(elements.at(-1))) {
+        if (isSimpleAndNotEmptyObject(elements) && !isSpreadElement(elements.at(-1))) {
             print(',');
             print.breakline();
         }

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

@@ -21,7 +21,7 @@ const {
     isCoupleLines,
     isStringAndArray,
     isIdentifierAndIdentifier,
-    isSimpleAndEmptyObject,
+    isSimpleAndNotEmptyObject,
 } = require('../../is');
 
 const {round} = Math;
@@ -62,7 +62,7 @@ module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
     if (elements.length > 3 && !isObjectExpression(elements[0]))
         return MULTI_LINE;
     
-    if (isSimpleAndEmptyObject(elements))
+    if (isSimpleAndNotEmptyObject(elements))
         return MULTI_LINE;
     
     if (isOneSimple(path))

package/lib/tokenize/is.js

@@ -67,7 +67,7 @@ function isStringAndIdentifier([a, b]) {
     return isStringLiteral(a) && isIdentifier(b);
 }
 
-module.exports.isSimpleAndEmptyObject = ([a, b]) => {
+module.exports.isSimpleAndNotEmptyObject = ([a, b]) => {
     if (!isIdentifier(a) && !isSpreadElement(a) && !isArrayExpression(a))
         return false;
     

package/lib/tokenize/statements/return-statement/maybe-space-after-keyword.js

@@ -8,6 +8,9 @@ module.exports.maybeSpaceAfterKeyword = (path, {print}, semantics) => {
     
     const {type} = argument;
     
+    if (type === 'SequenceExpression')
+        return print.space();
+    
     if (type === 'StringLiteral' || type === 'TemplateLiteral')
         return print.space();
     

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

@@ -1,19 +1,20 @@
 'use strict';
 
-const {isNext} = require('../../is');
+const {isNext, isParentLast} = require('../../is');
 
 module.exports.TryStatement = {
     print(path, {print}) {
         const finalizer = path.get('finalizer');
         print.indent();
-        print('try ');
+        print('try');
+        print.space();
         print('__block');
         print('__handler');
         
         if (finalizer.node) {
-            print(' ');
+            print.space();
             print('finally');
-            print(' ');
+            print.space();
             print(finalizer);
             print.newline();
         }
@@ -25,18 +26,25 @@ module.exports.TryStatement = {
     },
 };
 
-module.exports.CatchClause = (path, {print}) => {
+module.exports.CatchClause = (path, {print, maybe}) => {
     const param = path.get('param');
     const body = path.get('body');
     
-    print(' ');
-    print('catch ');
+    print.space();
+    print('catch');
+    print.space();
     
     if (param.node) {
         print('(');
         print(param);
-        print(') ');
+        print(')');
+        print.space();
     }
     
     print(body);
+    maybe.print.newline(isInsideBlock(path));
 };
+
+function isInsideBlock(path) {
+    return path.parentPath.parentPath.isBlockStatement();
+}

package/package.json

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