@putout/printer 2.47.0 → 2.49.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.07.05, v2.49.0
+
+feature:
+- 1120884 @putout/printer: ImportDeclaration: newline
+
+2023.07.05, v2.48.0
+
+feature:
+- 580a8ff @putout/printer: typescript: TSInterfaceDeclaration: empty body
+
 2023.07.05, v2.47.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,16 @@
+'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/program.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {parseComments} = require('../comments/comments');
+
 module.exports.Program = (path, {print, write}, semantics) => {
     print('__interpreter');
     parseComments(path, {write}, semantics);
@@ -11,4 +12,3 @@ module.exports.Program = (path, {print, write}, semantics) => {
     
     print.newline();
 };
-

package/lib/tokenize/typescript/index.js

@@ -13,8 +13,9 @@ const {
     TSModuleBlock,
 } = require('./ts-module-declaration');
 
-const {TSInterfaceDeclaration} = require('./ts-interface-declaration');
+const {TSInterfaceDeclaration} = require('./interface/ts-interface-declaration');
 const {TSAsExpression} = require('./ts-as-expression');
+const {TSInterfaceBody} = require('./interface/ts-interface-body');
 
 module.exports = {
     TSAsExpression,
@@ -104,21 +105,7 @@ module.exports = {
         print('__typeAnnotation');
     },
     TSInterfaceDeclaration,
-    TSInterfaceBody(path, {traverse, write, indent}) {
-        write(' {');
-        write.newline();
-        indent.inc();
-        
-        for (const item of path.get('body')) {
-            indent();
-            traverse(item);
-            write(';');
-            write.newline();
-        }
-        
-        indent.dec();
-        write('}');
-    },
+    TSInterfaceBody,
     TSTypeAssertion(path, {print}) {
         print('<');
         print('__typeAnnotation');

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

@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports.TSInterfaceBody = (path, {traverse, write, indent, maybe}) => {
+    const body = path.get('body');
+    write.space();
+    write('{');
+    maybe.write.newline(body.length);
+    indent.inc();
+    
+    for (const item of body) {
+        indent();
+        traverse(item);
+        write(';');
+        write.newline();
+    }
+    
+    indent.dec();
+    write('}');
+};

package/lib/tokenize/typescript/{ts-interface-declaration.js → interface/ts-interface-declaration.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isNext} = require('../is');
+const {isNext} = require('../../is');
 
 module.exports.TSInterfaceDeclaration = {
     print(path, {print}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "2.47.0",
+  "version": "2.49.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",