@putout/printer 1.8.3 → 1.8.5

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.03.27, v1.8.5
+
+feature:
+- f44a060 @putout/printer: drop newlines at end of file
+- 524d6e1 @putout/printer: drop newline after BlockStatement when there is no next sibling
+
+2023.03.27, v1.8.4
+
+feature:
+- c117645 @putout/printer: add support of ForInStatement
+
 2023.03.26, v1.8.3
 
 feature:

package/README.md

@@ -60,7 +60,7 @@ print(ast, {
 });
 
 // returns
-'const {a /* [hello world] */= 5} = b;\n\n';
+'const {a /* [hello world] */= 5} = b;';
 ```
 
 ## License

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

@@ -1,5 +1,6 @@
 'use strict';
 
+const {isNext} = require('../is');
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 
 module.exports.BlockStatement = (path, {indent, maybe, print}) => {
@@ -26,16 +27,17 @@ module.exports.BlockStatement = (path, {indent, maybe, print}) => {
         print(',');
     }
     
-    const shouldAddNewline = isAddNewLineAfter(path);
-    
-    if (shouldAddNewline) {
+    if (shouldAddNewlineAfter(path)) {
         print.newline();
     }
 };
 
-function isAddNewLineAfter(path) {
+function shouldAddNewlineAfter(path) {
     const {parentPath} = path;
     
+    if (parentPath.isStatement() && !path.node.body.length && !isNext(parentPath))
+        return false;
+    
     if (isTry(path) || /FunctionExpression/.test(path.parentPath.type))
         return false;
     

package/lib/tokenize/statements/for-in-statement.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports.ForInStatement = (path, {print}) => {
+    print('for ');
+    print('(');
+    print('__left');
+    print(' in ');
+    print('__right');
+    print(')');
+    
+    if (path.get('body').isBlockStatement())
+        print.space();
+    
+    print('__body');
+};

package/lib/tokenize/statements/index.js

@@ -13,6 +13,7 @@ const importDeclarations = require('./import-declarations');
 const exportDeclarations = require('./export-declarations');
 const {WhileStatement} = require('./while-statement');
 const {SwitchStatement} = require('./switch-statement');
+const {ForInStatement} = require('./for-in-statement');
 
 module.exports = {
     ...importDeclarations,
@@ -22,6 +23,7 @@ module.exports = {
     VariableDeclaration,
     IfStatement,
     ForStatement,
+    ForInStatement,
     ForOfStatement,
     ReturnStatement,
     DebuggerStatement,

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

@@ -9,13 +9,13 @@ const {
     markAfter,
 } = require('../mark');
 
+const isParentBlock = (path) => /Program|BlockStatement/.test(path.parentPath.type);
+
 module.exports.VariableDeclaration = (path, {maybe, print}) => {
     if (shouldAddNewlineBefore(path))
         print.breakline();
     
-    const isParentBlock = /Program|BlockStatement/.test(path.parentPath.type);
-    
-    maybe.indent(isParentBlock);
+    maybe.indent(isParentBlock(path));
     print(`${path.node.kind} `);
     print('__declarations.0.id');
     
@@ -23,22 +23,26 @@ module.exports.VariableDeclaration = (path, {maybe, print}) => {
     
     maybe.print(initPath.node, ' = ');
     print(initPath);
-    maybe.print(isParentBlock, ';');
-    maybe.print.newline(isParentBlock);
+    maybe.print(isParentBlock(path), ';');
+    let wasNewline = false;
     
-    const is = shouldAddNewlineAfter(path);
+    if (isParentBlock(path) && isNext(path)) {
+        print.newline();
+        wasNewline = true;
+    }
     
-    if (is) {
-        print.linebreak();
+    if (shouldAddNewlineAfter(path)) {
+        maybe.print.linebreak(wasNewline);
+        maybe.print.newline(!wasNewline);
         markAfter(path);
     }
 };
 
 function shouldAddNewlineAfter(path) {
-    if (isLast(path))
+    if (!isNext(path) && path.parentPath.isBlockStatement())
         return true;
     
-    if (!isNext(path))
+    if (isLast(path))
         return false;
     
     if (isCoupleLines(path))

package/lib/tokenize/tokenize.js

@@ -61,6 +61,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
     const maybeIndentDec = (a) => a && indent.dec();
     const maybeNewline = (a) => a && newline();
     const maybeBreakline = (a) => a && breakline();
+    const maybeLinebreak = (a) => a && linebreak();
     let i = 0;
     const incIndent = () => ++i;
     const decIndent = () => --i;
@@ -168,6 +169,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
         assign(maybePrint, {
             newline: maybeNewline,
             breakline: maybeBreakline,
+            linebreak: maybeLinebreak,
         });
         
         assign(printer.maybe, {

package/package.json

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