@putout/printer 1.5.1 → 1.5.2

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.03.19, v1.5.2
+
+feature:
+- 5354616 @putout/printer: add support of TryCatchStatement
+
 2023.03.18, v1.5.1
 
 feature:

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

@@ -2,7 +2,7 @@
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 
-module.exports.BlockStatement = (path, {write, indent, traverse}) => {
+module.exports.BlockStatement = (path, {write, indent, traverse, maybe}) => {
     const body = path.get('body');
     
     if (path.parentPath.isBlockStatement())
@@ -26,6 +26,17 @@ module.exports.BlockStatement = (path, {write, indent, traverse}) => {
         write(',');
     }
     
-    if (!/FunctionExpression/.test(path.parentPath.type))
-        write.newline();
+    const shouldAddNewLine = !isTry(path) && !/FunctionExpression/.test(path.parentPath.type);
+    
+    maybe.print.newline(shouldAddNewLine);
 };
+
+function isTry({parentPath}) {
+    if (parentPath.isTryStatement())
+        return true;
+    
+    if (parentPath.parentPath?.isTryStatement())
+        return true;
+    
+    return false;
+}

package/lib/tokenize/statements/index.js

@@ -6,6 +6,7 @@ const {IfStatement} = require('./if-statement');
 const {ForOfStatement} = require('./for-of-statement');
 const {BlockStatement} = require('./block-statement');
 const {ReturnStatement} = require('./return-statement');
+const TryStatements = require('./try-statements');
 
 module.exports = {
     BlockStatement,
@@ -17,6 +18,7 @@ module.exports = {
     Program(path, {traverse}) {
         path.get('body').forEach(traverse);
     },
+    ...TryStatements,
     ContinueStatement(path, {write, indent}) {
         indent();
         write('continue;\n');

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

@@ -0,0 +1,37 @@
+'use strict';
+
+const {isNext} = require('../is');
+module.exports.TryStatement = (path, {print, maybe}) => {
+    const finalizer = path.get('finalizer');
+    
+    print('try ');
+    print(path.get('block'));
+    print(path.get('handler'));
+    
+    if (finalizer.node) {
+        print(' ');
+        print('finally');
+        print(' ');
+        print(finalizer);
+        print.newline();
+    }
+    
+    maybe.print.linebreak(isNext(path));
+};
+
+module.exports.CatchClause = (path, {print}) => {
+    const param = path.get('param');
+    const body = path.get('body');
+    
+    print(' ');
+    print('catch ');
+    
+    if (param.node) {
+        print('(');
+        print(param);
+        print(') ');
+    }
+    
+    print(body);
+};
+

package/lib/tokenize/tokenize.js

@@ -36,6 +36,8 @@ module.exports.tokenize = (ast) => {
     const maybeIndent = (a) => a && indent();
     const maybeIndentInc = (a) => a && indent.inc();
     const maybeIndentDec = (a) => a && indent.dec();
+    const maybeNewline = (a) => a && newline();
+    const maybeLinebreak = (a) => a && writeEmptyLine();
     
     let i = 0;
     const incIndent = () => ++i;
@@ -94,6 +96,10 @@ module.exports.tokenize = (ast) => {
     });
     
     assign(print, write);
+    assign(maybePrint, {
+        newline: maybeNewline,
+        linebreak: maybeLinebreak,
+    });
     
     const printer = {
         incIndent,

package/package.json

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