@putout/printer 2.46.0 → 2.48.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.07.05, v2.48.0
+
+feature:
+- 580a8ff @putout/printer: typescript: TSInterfaceDeclaration: empty body
+
+2023.07.05, v2.47.0
+
+feature:
+- dc0ba73 @putout/printer: Program: improve support of inner comments
+
 2023.07.04, v2.46.0
 
 feature:

package/lib/tokenize/{comments.js → comments/comments.js}

@@ -3,9 +3,9 @@
 const {
     hasTrailingComment,
     isLast,
-} = require('./is');
+} = require('../is');
 
-const {markBefore} = require('./mark');
+const {markBefore} = require('../mark');
 const {isVariableDeclarator} = require('@babel/types');
 
 module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
@@ -99,6 +99,13 @@ module.exports.parseComments = (path, {write}, semantics) => {
             write('//');
             write(value);
             write.newline();
+            continue;
+        }
+        
+        if (type === 'CommentBlock') {
+            write('/*');
+            write(value);
+            write('*/');
         }
     }
 };

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

@@ -11,7 +11,7 @@ const {
     exists,
 } = require('../../is');
 
-const {parseComments} = require('../../comments');
+const {parseComments} = require('../../comments/comments');
 const {isSpreadElement} = require('@babel/types');
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;

package/lib/tokenize/literals/index.js

@@ -71,4 +71,3 @@ module.exports = {
         write('super');
     },
 };
-

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

@@ -13,7 +13,7 @@ const {
 } = require('@babel/types');
 
 const {markAfter} = require('../../mark');
-const {parseComments} = require('../../comments');
+const {parseComments} = require('../../comments/comments');
 const {insideIfWithNoBody} = require('./inside-if-with-no-body');
 
 const isFirstStatement = (path) => path.node.body[0];

package/lib/tokenize/statements/index.js

@@ -19,6 +19,7 @@ const {ForInStatement} = require('./for-in-statement');
 const {ExportDefaultDeclaration} = require('./export-declaration/export-default-declaration');
 const {BreakStatement} = require('./break-statement');
 const {DoWhileStatement} = require('./do-while-statement');
+const {Program} = require('./program');
 
 const {
     ExportNamespaceSpecifier,
@@ -48,15 +49,7 @@ module.exports = {
         print.space();
         print('__body');
     },
-    Program(path, {print}) {
-        print('__interpreter');
-        
-        path
-            .get('body')
-            .forEach(print);
-        
-        print.newline();
-    },
+    Program,
     EmptyStatement(path, {write}) {
         write(';');
     },

package/lib/tokenize/statements/program.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const {parseComments} = require('../comments/comments');
+
+module.exports.Program = (path, {print, write}, semantics) => {
+    print('__interpreter');
+    parseComments(path, {write}, semantics);
+    
+    path
+        .get('body')
+        .forEach(print);
+    
+    print.newline();
+};

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

@@ -13,7 +13,7 @@ const {isExportDeclaration} = require('@babel/types');
 const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
 
 const {isConcatenation} = require('../../expressions/binary-expression/concatanate');
-const {parseLeadingComments} = require('../../comments');
+const {parseLeadingComments} = require('../../comments/comments');
 
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
 const isInsideBlock = (path) => /^(Program|BlockStatement)$/.test(path.parentPath.type);

package/lib/tokenize/tokenize.js

@@ -27,7 +27,7 @@ const {
 const {
     parseLeadingComments,
     parseTrailingComments,
-} = require('./comments');
+} = require('./comments/comments');
 
 const {parseOverrides} = require('./overrides');
 

package/lib/tokenize/typescript/index.js

@@ -13,8 +13,9 @@ const {
     TSModuleBlock,
 } = require('./ts-module-declaration');
 
-const {TSInterfaceDeclaration} = require('./ts-interface-declaration');
+const {TSInterfaceDeclaration} = require('./interface/ts-interface-declaration');
 const {TSAsExpression} = require('./ts-as-expression');
+const {TSInterfaceBody} = require('./interface/ts-interface-body');
 
 module.exports = {
     TSAsExpression,
@@ -104,21 +105,7 @@ module.exports = {
         print('__typeAnnotation');
     },
     TSInterfaceDeclaration,
-    TSInterfaceBody(path, {traverse, write, indent}) {
-        write(' {');
-        write.newline();
-        indent.inc();
-        
-        for (const item of path.get('body')) {
-            indent();
-            traverse(item);
-            write(';');
-            write.newline();
-        }
-        
-        indent.dec();
-        write('}');
-    },
+    TSInterfaceBody,
     TSTypeAssertion(path, {print}) {
         print('<');
         print('__typeAnnotation');

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

@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports.TSInterfaceBody = (path, {traverse, write, indent, maybe}) => {
+    const body = path.get('body');
+    write.space();
+    write('{');
+    maybe.write.newline(body.length);
+    indent.inc();
+    
+    for (const item of body) {
+        indent();
+        traverse(item);
+        write(';');
+        write.newline();
+    }
+    
+    indent.dec();
+    write('}');
+};

package/lib/tokenize/typescript/{ts-interface-declaration.js → interface/ts-interface-declaration.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isNext} = require('../is');
+const {isNext} = require('../../is');
 
 module.exports.TSInterfaceDeclaration = {
     print(path, {print}) {
@@ -14,3 +14,4 @@ module.exports.TSInterfaceDeclaration = {
         print.breakline();
     },
 };
+

package/package.json

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