@putout/printer 1.10.0 → 1.11.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2023.03.29, v1.11.0
+
+feature:
+- a2250dd @putout/printer: add newline at eof
+- c1fb26f @putout/printer: use '__array.entries()' instead of 'entries(__array)'
+
 2023.03.28, v1.10.0
 
 feature:

package/README.md

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

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

@@ -1,7 +1,5 @@
 'use strict';
 
-const {entries} = Object;
-
 module.exports.NewExpression = (path, {indent, print, maybe}) => {
     indent();
     print('new ');
@@ -12,7 +10,7 @@ module.exports.NewExpression = (path, {indent, print, maybe}) => {
     
     const n = args.length - 1;
     
-    for (const [i, arg] of entries(args)) {
+    for (const [i, arg] of args.entries()) {
         print(arg);
         maybe.print(i < n, ', ');
     }

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

@@ -1,6 +1,5 @@
 'use strict';
 
-const {entries} = Object;
 const isForOf = (path) => path.parentPath?.parentPath?.parentPath?.isForOfStatement();
 
 module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
@@ -13,7 +12,7 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
     const is = !isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties);
     maybe.print(is, '\n');
     
-    for (const [i, property] of entries(properties)) {
+    for (const [i, property] of properties.entries()) {
         if (property.isRestElement()) {
             print(property);
             continue;

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

@@ -3,37 +3,43 @@
 const {
     isNext,
     isParentProgram,
+    isLast,
+
 } = require('../is');
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 
-module.exports.BlockStatement = (path, {indent, maybe, print}) => {
-    const body = path.get('body');
-    
-    if (path.parentPath.isBlockStatement())
-        indent();
-    
-    indent.inc();
-    print('{');
-    
-    if (body.length > 1 || isFirstStatement(path))
+module.exports.BlockStatement = {
+    print(path, {indent, maybe, print}) {
+        const body = path.get('body');
+        
+        if (path.parentPath.isBlockStatement())
+            indent();
+        
+        indent.inc();
+        print('{');
+        
+        if (body.length > 1 || isFirstStatement(path))
+            print.newline();
+        
+        for (const element of body) {
+            print(element);
+        }
+        
+        indent.dec();
+        maybe.indent(body.length);
+        print('}');
+        
+        if (path.parentPath.isObjectMethod()) {
+            print(',');
+        }
+    },
+    afterIf(path) {
+        return shouldAddNewlineAfter(path);
+    },
+    after(path, {print}) {
         print.newline();
-    
-    for (const element of body) {
-        print(element);
-    }
-    
-    indent.dec();
-    maybe.indent(body.length);
-    print('}');
-    
-    if (path.parentPath.isObjectMethod()) {
-        print(',');
-    }
-    
-    if (shouldAddNewlineAfter(path)) {
-        print.newline();
-    }
+    },
 };
 
 function shouldAddNewlineAfter(path) {
@@ -48,6 +54,9 @@ function shouldAddNewlineAfter(path) {
     if (isTry(path) || /FunctionExpression/.test(path.parentPath.type))
         return false;
     
+    if (isLast(path))
+        return false;
+    
     return true;
 }
 

package/lib/tokenize/statements/import-declarations.js

@@ -1,20 +1,19 @@
 'use strict';
 
 const {markAfter} = require('../mark');
-const {entries} = Object;
 
 module.exports.ImportDeclaration = (path, {print, maybe}) => {
     const specifiers = path.get('specifiers');
     print('import ');
     
-    for (const [index, spec] of entries(specifiers)) {
+    for (const [index, spec] of specifiers.entries()) {
         if (spec.isImportDefaultSpecifier()) {
             print(spec.get('local'));
             continue;
         }
         
         if (spec.isImportSpecifier()) {
-            maybe.print(Number(index), ', ');
+            maybe.print(index, ', ');
             print('{');
             print(spec.get('imported'));
             print('}');

package/lib/tokenize/statements/index.js

@@ -32,6 +32,7 @@ module.exports = {
     DebuggerStatement,
     Program(path, {print}) {
         path.get('body').forEach(print);
+        print.newline();
     },
     SwitchStatement,
     ...TryStatements,

package/package.json

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