@putout/printer 1.5.0 → 1.5.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.03.19, v1.5.2
+
+feature:
+- 5354616 @putout/printer: add support of TryCatchStatement
+
+2023.03.18, v1.5.1
+
+feature:
+- a79e4f6 @putout/printer: print, indent, maybe
+
 2023.03.18, v1.5.0
 
 feature:

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

@@ -7,44 +7,43 @@ const {
 
 const {entries} = Object;
 
-module.exports.CallExpression = (path, {traverse, indent, write, incIndent, decIndent, maybeWrite}) => {
+module.exports.CallExpression = (path, {indent, print, maybe}) => {
     const isParentCall = toLong(path) && path.parentPath.isCallExpression();
     
     if (shouldAddNewLine(path) && !isMarkedParentBefore(path) && !isMarkedPrevAfter(path.parentPath))
-        write.linebreak();
+        print.linebreak();
     
-    traverse(path.get('callee'));
-    write('(');
+    print(path.get('callee'));
+    print('(');
     
     const args = path.get('arguments');
     const n = args.length - 1;
     
-    if (isParentCall)
-        incIndent();
+    maybe.indent.inc(isParentCall);
     
     for (const [i, arg] of entries(args)) {
         if (isParentCall) {
-            write.newline();
+            print.newline();
             indent();
         }
         
-        traverse(arg);
+        print(arg);
         
         if (isParentCall) {
-            write(',');
+            print(',');
             continue;
         }
         
-        maybeWrite(i < n, ', ');
+        maybe.print(i < n, ', ');
     }
     
     if (isParentCall) {
-        decIndent();
-        write.newline();
-        write.indent();
+        indent.dec();
+        print.newline();
+        print.indent();
     }
     
-    write(')');
+    print(')');
 };
 
 function shouldAddNewLine({parentPath}) {

package/lib/tokenize/expressions/class-declaration.js

@@ -4,27 +4,27 @@ const {entries} = Object;
 
 const isFirst = (path) => path.node === path.parentPath.node.body[0];
 
-module.exports.ClassDeclaration = (path, {write, maybeWrite, writeEmptyLine, indent, incIndent, decIndent, traverse}) => {
+module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
     if (!isFirst(path)) {
-        writeEmptyLine();
+        print.linebreak();
     }
     
     indent();
-    write('class ');
-    traverse(path.get('id'));
-    write(' {\n');
-    incIndent();
+    print('class ');
+    print(path.get('id'));
+    print(' {\n');
+    indent.inc();
     
     const body = path.get('body.body');
     const n = body.length - 1;
     
     for (const [i, item] of entries(body)) {
         indent();
-        traverse(item);
-        maybeWrite(i < n, '\n');
+        print(item);
+        maybe.print(i < n, '\n');
     }
     
-    decIndent();
-    write('}');
+    indent.dec();
+    print('}');
 };
 

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

@@ -3,20 +3,19 @@
 const {entries} = Object;
 const isForOf = (path) => path.parentPath?.parentPath?.parentPath?.isForOfStatement();
 
-module.exports.ObjectPattern = (path, {traverse, maybeIndent, write, maybeWrite, incIndent, decIndent}) => {
-    incIndent();
-    
-    write('{');
+module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
+    indent.inc();
+    print('{');
     
     const properties = path.get('properties');
     const n = properties.length - 1;
     
     const is = !isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties);
-    maybeWrite(is, '\n');
+    maybe.print(is, '\n');
     
     for (const [i, property] of entries(properties)) {
         if (property.isRestElement()) {
-            traverse(property);
+            print(property);
             continue;
         }
         
@@ -24,29 +23,29 @@ module.exports.ObjectPattern = (path, {traverse, maybeIndent, write, maybeWrite,
         const keyPath = property.get('key');
         const {shorthand} = property.node;
         
-        maybeIndent(is);
-        traverse(keyPath);
+        maybe.indent(is);
+        print(keyPath);
         
         if (!shorthand) {
-            write(': ');
-            traverse(valuePath);
+            print(': ');
+            print(valuePath);
         }
         
         if (valuePath.isAssignmentPattern())
-            traverse(valuePath);
+            print(valuePath);
         
         if (is) {
-            write(',\n');
+            print(',');
+            print.newline();
             continue;
         }
         
-        if (i < n)
-            write(', ');
+        maybe.print(i < n, ', ');
     }
     
-    decIndent();
-    maybeIndent(is);
-    write('}');
+    indent.dec();
+    maybe.indent(is);
+    print('}');
 };
 
 function checkLength(properties) {
@@ -57,3 +56,4 @@ function checkLength(properties) {
     
     return false;
 }
+

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

@@ -12,6 +12,8 @@ const {
 } = require('./mark');
 const {parseComments} = require('./comments');
 
+const isString = (a) => typeof a === 'string';
+
 const {assign} = Object;
 
 const traversers = {
@@ -34,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;
@@ -69,12 +73,21 @@ module.exports.tokenize = (ast) => {
         newline,
         linebreak: writeEmptyLine,
     });
+    const print = (maybeLine) => {
+        if (isString(maybeLine))
+            return write(maybeLine);
+        
+        return traverse(maybeLine);
+    };
+    
+    const maybePrint = (a, b) => a && print(b);
     
     const maybe = {
         write: maybeWrite,
         indent: maybeIndent,
         markBefore: maybeMarkBefore,
         markAfter: maybeMarkAfter,
+        print: maybePrint,
     };
     
     assign(maybe.indent, {
@@ -82,6 +95,12 @@ module.exports.tokenize = (ast) => {
         dec: maybeIndentDec,
     });
     
+    assign(print, write);
+    assign(maybePrint, {
+        newline: maybeNewline,
+        linebreak: maybeLinebreak,
+    });
+    
     const printer = {
         incIndent,
         decIndent,
@@ -93,6 +112,7 @@ module.exports.tokenize = (ast) => {
         traverse,
         writeEmptyLine,
         maybe,
+        print,
     };
     
     babelTraverse(ast, {

package/package.json

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