@putout/printer 2.48.0 → 2.50.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.07.05, v2.50.0
+
+feature:
+- f77a990 @putout/printer: BlockStatement: newlines
+- 483494a package: c8 v8.0.0
+- dabddf7 package: @putout/plugin-promises v11.0.0
+- bf8f478 package: putout v30.0.0
+
+2023.07.05, v2.49.0
+
+feature:
+- 1120884 @putout/printer: ImportDeclaration: newline
+
 2023.07.05, v2.48.0
 
 feature:

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

@@ -4,37 +4,35 @@ const {isNext} = require('../../is');
 const {markAfter} = require('../../mark');
 const {maybeDecorators} = require('../../maybe-get');
 
-module.exports.ClassExpression = classVisitor;
+const isInsideExport = ({parentPath}) => parentPath.isExportDeclaration();
 
-module.exports.StaticBlock = (path, {print, traverse}) => {
-    print('static ');
-    print('{');
-    print.breakline();
-    
-    for (const child of path.get('body')) {
-        traverse(child);
-    }
-    
-    print.indent();
-    print('}');
-    print.newline();
-};
+module.exports.ClassExpression = classVisitor;
 
-module.exports.ClassDeclaration = (path, {print, indent, maybe, write, traverse}) => {
-    indent();
-    
-    classVisitor(path, {
-        print,
-        indent,
-        maybe,
-        traverse,
-    });
-    
-    if (!path.parentPath.isExportDeclaration() && isNext(path)) {
+module.exports.ClassDeclaration = {
+    print(path, {print, indent, maybe, traverse}) {
+        indent();
+        
+        classVisitor(path, {
+            print,
+            indent,
+            maybe,
+            traverse,
+        });
+    },
+    afterIf(path) {
+        if (!isNext(path))
+            return false;
+        
+        return !isInsideExport(path);
+    },
+    after(path, {write}) {
         write.newline();
-        maybe.write.newline(path.node.body.body.length);
-        markAfter(path);
-    }
+        
+        if (path.node.body.body.length) {
+            write.newline();
+            markAfter(path);
+        }
+    },
 };
 
 function classVisitor(path, {print, indent, maybe, traverse}) {

package/lib/tokenize/expressions/class/static-block.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports.StaticBlock = (path, {print, traverse}) => {
+    print('static ');
+    print('{');
+    print.breakline();
+    
+    for (const child of path.get('body')) {
+        traverse(child);
+    }
+    
+    print.indent();
+    print('}');
+    print.newline();
+};

package/lib/tokenize/expressions/index.js

@@ -7,7 +7,6 @@ const memberExpressions = require('./member-expressions/member-expressions');
 const {
     ClassExpression,
     ClassDeclaration,
-    StaticBlock,
 } = require('./class/class');
 
 const {
@@ -42,6 +41,7 @@ const {
 } = require('./binary-expression/binary-expression');
 
 const {ConditionalExpression} = require('./conditional-expression');
+const {StaticBlock} = require('./class/static-block');
 
 module.exports = {
     ...functions,

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const {exists} = require('../is');
+const {isMarkedAfter} = require('../mark');
 const isInsideExpressionStatement = ({parentPath}) => parentPath.isExpressionStatement();
 const notFirst = ({parentPath}) => exists(parentPath.getPrevSibling());
 
@@ -23,6 +24,9 @@ module.exports.NewExpression = {
         if (!exists)
             return false;
         
+        if (isMarkedAfter(prev))
+            return false;
+        
         if (prev.isExpressionStatement())
             return false;
         

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

@@ -4,6 +4,12 @@ const {markAfter} = require('../../mark');
 const {exists} = require('../../is');
 
 const isEmptyConsequent = (path) => path.get('consequent').isEmptyStatement();
+const isInsideNestedBody = ({parentPath}) => {
+    if (parentPath.type !== 'BlockStatement')
+        return false;
+    
+    return parentPath.parentPath.type === 'BlockStatement';
+};
 
 const isInsideIf = (path) => path.parentPath.parentPath?.isIfStatement();
 const isEmptyBody = (path) => !path.node.body.length;
@@ -24,7 +30,10 @@ module.exports.IfStatement = {
         if (isConsequentBlock) {
             print.space();
             print(consequent);
-            maybe.print.newline(isEmptyBody(consequent) && isInsideIf(path));
+            
+            if (isInsideIf(path) || isInsideNestedBody(path)) {
+                maybe.print.newline(isEmptyBody(consequent));
+            }
         } else {
             const is = !isEmptyConsequent(path);
             maybe.print.newline(is);
@@ -64,3 +73,4 @@ module.exports.IfStatement = {
         markAfter(path);
     },
 };
+

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

@@ -14,4 +14,3 @@ module.exports.TSInterfaceDeclaration = {
         print.breakline();
     },
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "2.48.0",
+  "version": "2.50.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -50,12 +50,12 @@
     "@babel/plugin-codemod-object-assign-to-object-spread": "^7.10.4",
     "@putout/plugin-minify": "^1.8.0",
     "@putout/plugin-printer": "^1.0.0",
-    "@putout/plugin-promises": "^10.0.0",
+    "@putout/plugin-promises": "^11.0.0",
     "@putout/plugin-react-hook-form": "^3.4.1",
     "@putout/plugin-react-hooks": "^5.0.0",
     "@putout/test": "^6.0.1",
     "acorn": "^8.8.2",
-    "c8": "^7.5.0",
+    "c8": "^8.0.0",
     "escover": "^3.0.0",
     "eslint": "^8.0.1",
     "eslint-plugin-n": "^16.0.0",
@@ -66,7 +66,7 @@
     "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^2.0.1",
-    "putout": "29",
+    "putout": "^30.0.0",
     "supertape": "^8.0.0",
     "try-catch": "^3.0.0"
   },