@putout/printer 1.14.1 → 1.14.3

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.03.30, v1.14.3
+
+feature:
+- a060299 @putout/printer: improve support EmptyStatement
+
+2023.03.30, v1.14.2
+
+feature:
+- 6bf7725 @putout/printer: add support of EmptyStatement
+
 2023.03.30, v1.14.1
 
 fix:

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

@@ -99,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/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/for-statement.js

@@ -3,7 +3,7 @@
 const {isLast} = require('../is');
 
 module.exports.ForStatement = {
-    print(path, {print, maybe, indent}) {
+    print(path, {print, maybe}) {
         const {
             test,
             update,
@@ -24,10 +24,12 @@ module.exports.ForStatement = {
             print(' ');
             print('__body');
         } else {
-            print.newline();
-            indent.inc();
+            const is = !path.get('body').isEmptyStatement();
+            
+            maybe.print.newline(is);
+            maybe.indent.inc(is);
             print('__body');
-            indent.dec();
+            maybe.indent.dec(is);
         }
     },
     after(path, {print}) {

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

@@ -3,49 +3,59 @@
 const {hasPrevNewline, markAfter} = require('../mark');
 const {isFirst} = require('../is');
 
-module.exports.IfStatement = (path, {indent, print}) => {
-    if (shouldAddNewlineBefore(path)) {
+const isEmptyConsequent = (path) => path.get('consequent').isEmptyStatement();
+
+module.exports.IfStatement = {
+    before: (path, {print}) => {
         print.linebreak();
-    }
-    
-    indent();
-    print('if (');
-    print('__test');
-    print(')');
-    
-    const consequent = path.get('consequent');
-    const alternate = path.get('alternate');
-    
-    if (consequent.isBlockStatement()) {
-        print(' ');
-        print(consequent);
-    } else {
-        print.newline();
-        indent.inc();
-        print(consequent);
-        indent.dec();
-    }
-    
-    if (alternate.isBlockStatement()) {
-        print(' else ');
-        print(alternate);
-    } else if (alternate.node) {
-        print.breakline();
-        print('else');
+    },
+    beforeIf: shouldAddNewlineBefore,
+    print: (path, {indent, print, maybe}) => {
+        indent();
+        print('if (');
+        print('__test');
+        print(')');
+        
+        const consequent = path.get('consequent');
+        const alternate = path.get('alternate');
+        
+        if (consequent.isBlockStatement()) {
+            print(' ');
+            print(consequent);
+        } else {
+            const is = !isEmptyConsequent(path);
+            
+            maybe.print.newline(is);
+            maybe.indent.inc(is);
+            print(consequent);
+            maybe.indent.dec(is);
+        }
+        
+        if (alternate.isBlockStatement()) {
+            print(' else ');
+            print(alternate);
+        } else if (alternate.node) {
+            print.breakline();
+            print('else');
+            print.newline();
+            indent.inc();
+            print(alternate);
+            indent.dec();
+        }
+    },
+    afterIf: (path) => {
+        const next = path.getNextSibling();
+        
+        if (!next.node || next.isExpressionStatement() || next.isReturnStatement())
+            return false;
+        
+        return true;
+    },
+    after: (path, {print}) => {
+        print.indent();
         print.newline();
-        indent.inc();
-        print(alternate);
-        indent.dec();
-    }
-    
-    const next = path.getNextSibling();
-    
-    if (!next.node || next.isExpressionStatement() || next.isReturnStatement())
-        return;
-    
-    print.indent();
-    print.newline();
-    markAfter(path);
+        markAfter(path);
+    },
 };
 
 function shouldAddNewlineBefore(path) {

package/lib/tokenize/statements/index.js

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

package/package.json

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