@putout/printer 5.15.0 → 5.17.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.10.02, v5.17.0
+
+feature:
+- 2b343e6 @putout/printer: ClassBody: comments
+
+2023.10.02, v5.16.0
+
+feature:
+- ac06127 @putout/printer: TSModuleDeclaration: module
+
 2023.10.02, v5.15.0
 
 feature:

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

@@ -4,21 +4,17 @@ const {isNext} = require('../../is');
 const {markAfter} = require('../../mark');
 const {maybeDecorators} = require('../../maybe-get');
 const {maybeDeclare} = require('../../typescript/namespace/maybeDeclare');
+const {parseComments} = require('../../comment/comment');
 
 const isInsideExport = ({parentPath}) => parentPath.isExportDeclaration();
 
 module.exports.ClassExpression = classVisitor;
 
 module.exports.ClassDeclaration = {
-    print: maybeDeclare((path, {print, indent, maybe, traverse}) => {
+    print: maybeDeclare((path, printer, semantics) => {
+        const {indent} = printer;
         indent();
-        
-        classVisitor(path, {
-            print,
-            indent,
-            maybe,
-            traverse,
-        });
+        classVisitor(path, printer, semantics);
     }),
     afterIf(path) {
         if (!isNext(path))
@@ -36,8 +32,14 @@ module.exports.ClassDeclaration = {
     },
 };
 
-function classVisitor(path, {print, indent, maybe, traverse}) {
+function classVisitor(path, printer, semantics) {
     const {id, abstract} = path.node;
+    const {
+        print,
+        indent,
+        maybe,
+        traverse,
+    } = printer;
     
     for (const decorator of maybeDecorators(path)) {
         traverse(decorator);
@@ -69,14 +71,20 @@ function classVisitor(path, {print, indent, maybe, traverse}) {
     maybe.print.newline(path.node.body.body.length);
     indent.inc();
     
-    const body = path.get('body.body');
+    const classBody = path.get('body');
+    const body = classBody.get('body');
     
     for (const item of body) {
         indent();
         traverse(item);
     }
     
+    if (!body.length) {
+        parseComments(classBody, printer, semantics);
+    }
+    
     indent.dec();
     maybe.indent(body.length);
     print('}');
 }
+

package/lib/tokenize/typescript/function/ts-method-signature.js

@@ -11,6 +11,7 @@ module.exports.TSMethodSignature = (path, printer, semantics) => {
     const {traverse, write} = printer;
     
     traverse(path.get('key'));
+    traverse(path.get('typeParameters'));
     printParams(path, printer, semantics);
     
     if (hasReturnType(path)) {

package/lib/tokenize/typescript/interface/ts-interface-body.js

@@ -15,5 +15,7 @@ module.exports.TSInterfaceBody = (path, {traverse, write, indent, maybe}) => {
     }
     
     indent.dec();
+    indent();
     write('}');
+    maybe.write.newline(path.parentPath.parentPath.isTSModuleBlock());
 };

package/lib/tokenize/typescript/interface/ts-interface-declaration.js

@@ -9,9 +9,11 @@ const {isNext, isNextParent} = require('../../is');
 const {maybeDeclare} = require('../namespace/maybeDeclare');
 
 module.exports.TSInterfaceDeclaration = {
-    print: maybeDeclare((path, {print}) => {
+    print: maybeDeclare((path, {print, indent}) => {
+        indent();
         print('interface ');
         print('__id');
+        print('__typeParameters');
         print('__body');
     }),
     afterSatisfy: () => [isNext, isNextParent],

package/lib/tokenize/typescript/namespace/ts-module-declaration.js

@@ -5,7 +5,13 @@ const {maybeDeclare} = require('./maybeDeclare');
 
 module.exports.TSModuleDeclaration = {
     print: maybeDeclare((path, {print}) => {
-        print('namespace ');
+        const id = path.get('id');
+        
+        if (id.isStringLiteral())
+            print('module ');
+        else
+            print('namespace ');
+        
         print('__id');
         print.space();
         print('__body');
@@ -22,8 +28,9 @@ module.exports.TSModuleBlock = (path, {print, traverse, indent}) => {
     print.breakline();
     indent.inc();
     
-    for (const child of path.get('body'))
+    for (const child of path.get('body')) {
         traverse(child);
+    }
     
     indent.dec();
     print('}');

package/package.json

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