@putout/printer 1.14.0 → 1.14.2

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.03.30, v1.14.2
+
+feature:
+- 6bf7725 @putout/printer: add support of EmptyStatement
+
+2023.03.30, v1.14.1
+
+fix:
+- 1a117af @putout/printer: duplicate comment
+
+feature:
+- 260d680 @putout/printer: add support of getters
+
 2023.03.30, v1.14.0
 
 feature:

package/README.md

@@ -24,7 +24,6 @@ const ast = parse('const a = (b, c) => {const d = 5; return a;}');
 
 print(ast);
 
-// returns
 // returns
 `
 const a = (b, c) => {
@@ -32,7 +31,6 @@ const a = (b, c) => {
     return a;
 };
 `;
-
 ```
 
 ## Overrides
@@ -62,10 +60,8 @@ print(ast, {
     },
 });
 
-// returns
 // returns
 'const {a /* [hello world] */= 5} = b;\n';
-
 ```
 
 ## License

package/lib/tokenize/comments.js

@@ -1,7 +1,13 @@
 'use strict';
 
-const {isFirst} = require('./is');
-const {markBefore} = require('./mark');
+const {
+    isFirst,
+    isNext,
+} = require('./is');
+const {
+    markBefore,
+    hasPrevNewline,
+} = require('./mark');
 
 module.exports.parseLeadingComments = (path, {print, indent}) => {
     const {leadingComments} = path.node;
@@ -41,6 +47,9 @@ module.exports.parseTrailingComments = (path, {print}) => {
     if (!trailingComments || !trailingComments.length)
         return;
     
+    if (isNext(path))
+        return;
+    
     for (const {type, value} of trailingComments) {
         if (type === 'CommentLine') {
             print.space();
@@ -52,5 +61,5 @@ module.exports.parseTrailingComments = (path, {print}) => {
 };
 
 function shouldAddNewlineBefore(path) {
-    return path.isStatement() && !isFirst(path);
+    return path.isStatement() && !isFirst(path) && !hasPrevNewline(path);
 }

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

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
+module.exports.ClassDeclaration = (path, {print, indent}) => {
     indent();
     print('class ');
     print('__id');
@@ -17,12 +17,10 @@ module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
     indent.inc();
     
     const body = path.get('body.body');
-    const n = body.length - 1;
     
-    for (const [i, item] of body.entries()) {
+    for (const item of body) {
         indent();
         print(item);
-        maybe.print(i < n, '\n');
     }
     
     indent.dec();

package/lib/tokenize/expressions/functions.js

@@ -51,6 +51,11 @@ function ArrowFunctionExpression(path, {print, maybe}) {
     print('__body');
 }
 module.exports.ObjectMethod = (path, {print}) => {
+    const {kind} = path.node;
+    
+    if (kind !== 'method')
+        print(`${kind} `);
+    
     print('__key');
     print('(');
     
@@ -94,6 +99,11 @@ module.exports.FunctionDeclaration = (path, {print, maybe}) => {
 };
 
 module.exports.ClassMethod = (path, {print}) => {
+    const {kind} = path.node;
+    
+    if (kind !== 'method')
+        print(`${kind} `);
+    
     print('__key');
     print('(');
     

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

@@ -1,7 +1,6 @@
 'use strict';
 
 const {isCoupleLines} = require('../is');
-
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
 
@@ -90,4 +89,3 @@ function isOneLine(path) {
     
     return isForOf(path);
 }
-

package/lib/tokenize/expressions/unary-expressions.js

@@ -44,6 +44,7 @@ function unaryExpression(path, {print, maybe}) {
     maybe.print(isWord(
         operator,
     ), ' ');
+    
     print('__argument');
     
     if (!prefix)

package/lib/tokenize/is.js

@@ -2,8 +2,17 @@
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
 const isParentBlock = (path) => path.parentPath.isBlockStatement();
-const isNext = (path) => path.getNextSibling().node;
-const isNextParent = (path) => path.parentPath.getNextSibling().node;
+
+const isNext = (path) => {
+    const next = path.getNextSibling();
+    
+    if (!next.node)
+        return false;
+    
+    return !next.isEmptyStatement();
+};
+
+const isNextParent = (path) => isNext(path.parentPath);
 const isLast = (path) => isParentProgram(path) && !isNext(path);
 
 module.exports.isFirst = (path) => path.node === path.parentPath.node.body[0];

package/lib/tokenize/statements/index.js

@@ -35,6 +35,7 @@ module.exports = {
         path.get('body').forEach(print);
         print.newline();
     },
+    EmptyStatement({}) {},
     InterpreterDirective(path, {print}) {
         print(`#!${path.node.value}`);
         print.newline();

package/package.json

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