@putout/printer 2.41.0 → 2.42.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.06.22, v2.42.0
+
+feature:
+- ae2311d @putout/printer: Decorator: add
+
 2023.06.22, v2.41.0
 
 feature:

package/lib/tokenize/expressions/class.js

@@ -2,6 +2,7 @@
 
 const {isNext} = require('../is');
 const {markAfter} = require('../mark');
+const {maybeDecorators} = require('../maybe-get');
 
 module.exports.ClassExpression = classVisitor;
 module.exports.ClassDeclaration = classVisitor;
@@ -20,13 +21,14 @@ module.exports.StaticBlock = (path, {print, traverse}) => {
     print.newline();
 };
 
-module.exports.ClassDeclaration = (path, {print, indent, maybe, write}) => {
+module.exports.ClassDeclaration = (path, {print, indent, maybe, write, traverse}) => {
     indent();
     
     classVisitor(path, {
         print,
         indent,
         maybe,
+        traverse,
     });
     
     if (!path.parentPath.isExportDeclaration() && isNext(path)) {
@@ -36,7 +38,12 @@ module.exports.ClassDeclaration = (path, {print, indent, maybe, write}) => {
     }
 };
 
-function classVisitor(path, {print, indent, maybe}) {
+function classVisitor(path, {print, indent, maybe, traverse}) {
+    for (const decorator of maybeDecorators(path)) {
+        traverse(decorator);
+        print.breakline();
+    }
+    
     print('class ');
     print('__id');
     print('__typeParameters');
@@ -64,7 +71,7 @@ function classVisitor(path, {print, indent, maybe}) {
     
     for (const item of body) {
         indent();
-        print(item);
+        traverse(item);
     }
     
     indent.dec();

package/lib/tokenize/expressions/functions/class-method.js

@@ -40,4 +40,3 @@ const ClassMethod = {
 
 module.exports.ClassPrivateMethod = ClassMethod;
 module.exports.ClassMethod = ClassMethod;
-

package/lib/tokenize/expressions/functions/function-declaration.js

@@ -32,4 +32,3 @@ module.exports.FunctionDeclaration = {
         markAfter(path);
     },
 };
-

package/lib/tokenize/expressions/functions/object-method.js

@@ -41,4 +41,3 @@ module.exports.ObjectMethod = {
         print.linebreak();
     },
 };
-

package/lib/tokenize/expressions/functions/params.js

@@ -48,4 +48,3 @@ function isOneArgArrow(path) {
     
     return param.type === 'Identifier';
 }
-

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

@@ -1,19 +1,50 @@
 'use strict';
 
-module.exports.NewExpression = (path, {print, maybe}) => {
-    print('new ');
-    print('__callee');
-    print('__typeParameters');
-    
-    const args = path.get('arguments');
-    print('(');
-    
-    const n = args.length - 1;
-    
-    for (const [i, arg] of args.entries()) {
-        print(arg);
-        maybe.print(i < n, ', ');
-    }
-    
-    print(')');
+const {exists} = require('../is');
+const isInsideExpressionStatement = ({parentPath}) => parentPath.isExpressionStatement();
+const notFirst = ({parentPath}) => exists(parentPath.getPrevSibling());
+
+const getPrev = ({parentPath}) => {
+    const prev = parentPath.getPrevSibling();
+    return [
+        prev.node,
+        prev,
+    ];
+};
+
+module.exports.NewExpression = {
+    beforeIf(path) {
+        if (!isInsideExpressionStatement(path))
+            return false;
+        
+        const [exists, prev] = getPrev(path);
+        
+        if (!exists)
+            return false;
+        
+        if (prev.isExpressionStatement())
+            return false;
+        
+        return notFirst(path);
+    },
+    before(path, {print}) {
+        print.breakline();
+    },
+    print(path, {print, maybe}) {
+        print('new ');
+        print('__callee');
+        print('__typeParameters');
+        
+        const args = path.get('arguments');
+        print('(');
+        
+        const n = args.length - 1;
+        
+        for (const [i, arg] of args.entries()) {
+            print(arg);
+            maybe.print(i < n, ', ');
+        }
+        
+        print(')');
+    },
 };

package/lib/tokenize/literals/index.js

@@ -1,12 +1,7 @@
 'use strict';
 
 const {TemplateLiteral} = require('./template-literal');
-const maybeDecorators = (path) => {
-    if (!path.node.decorators)
-        return [];
-    
-    return path.get('decorators');
-};
+const {maybeDecorators} = require('../maybe-get');
 
 module.exports = {
     TemplateLiteral,
@@ -16,7 +11,6 @@ module.exports = {
     Decorator(path, {print}) {
         print('@');
         print('__expression');
-        print(' ');
     },
     NumericLiteral(path, {write}) {
         const {
@@ -35,7 +29,7 @@ module.exports = {
         
         write(raw || `'${value}'`);
     },
-    Identifier(path, {write, maybe, traverse}) {
+    Identifier(path, {write, maybe, traverse, print}) {
         const {node} = path;
         const {name, optional} = node;
         const parenthesized = node.extra?.parenthesized;
@@ -44,6 +38,7 @@ module.exports = {
         maybe.write(parenthesized, '(');
         for (const decorator of maybeDecorators(path)) {
             traverse(decorator);
+            print(' ');
         }
         
         write(name);

package/lib/tokenize/maybe-get.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.maybeDecorators = (path) => {
+    if (!path.node.decorators)
+        return [];
+    
+    return path.get('decorators');
+};

package/package.json

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