@putout/printer 8.22.0 → 8.23.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2024.04.30, v8.23.0
+
+feature:
+- a0dc84e @putout/printer: improve support of Decorators
+
 2024.04.29, v8.22.0
 
 feature:

package/lib/tokenize/comment/parse-leading-comments.js

@@ -26,6 +26,8 @@ const isProperty = satisfy([
     isSpreadElement,
 ]);
 
+const hasDecorators = ({parentPath}) => parentPath.node.decorators?.length;
+
 function isCommentOfPrevious(path) {
     const [comment] = path.node.leadingComments;
     const {line} = comment.loc.start;
@@ -62,6 +64,9 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
     if (!leadingComments?.length)
         return;
     
+    if (hasDecorators(path))
+        return;
+    
     const looksLikeSwitchCase = path.isSwitchCase();
     
     if (!looksLikeSwitchCase && hasTrailingComment(path.getPrevSibling()))

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

@@ -1,14 +1,16 @@
 'use strict';
 
+const {isFunction} = require('@putout/babel').types;
 const {isNext} = require('../../is');
 const {markAfter} = require('../../mark');
 
-//const {maybeDecorators} = require('../../maybe-get');
 const {maybeDeclare} = require('../../maybe/maybe-declare');
 const {parseComments} = require('../../comment/comment');
 const {maybeDecorators} = require('../../maybe/maybe-decorators');
 
 const isInsideExport = ({parentPath}) => parentPath.isExportDeclaration();
+const isFunctionLike = (path) => isFunction(path.parentPath.parentPath);
+const hasBody = ({node}) => node.body.body.length;
 
 const classVisitor = maybeDecorators((path, printer, semantics) => {
     const {id, abstract} = path.node;
@@ -70,6 +72,9 @@ module.exports.ClassDeclaration = {
         classVisitor(path, printer, semantics);
     }),
     afterIf(path) {
+        if (isFunctionLike(path))
+            return true;
+        
         if (!isNext(path))
             return false;
         
@@ -78,7 +83,7 @@ module.exports.ClassDeclaration = {
     after(path, {write}) {
         write.newline();
         
-        if (path.node.body.body.length) {
+        if (!isFunctionLike(path) && hasBody(path)) {
             write.newline();
             markAfter(path);
         }

package/lib/tokenize/expressions/decorator.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const {isMemberExpression} = require('@putout/babel').types;
+
+module.exports.Decorator = (path, {print, maybe}) => {
+    const {expression} = path.node;
+    const isMember = isMemberExpression(expression);
+    
+    print('@');
+    
+    maybe.print(isMember, '(');
+    print('__expression');
+    maybe.print(isMember, ')');
+};

package/lib/tokenize/literals/index.js

@@ -3,6 +3,8 @@
 const {TemplateLiteral} = require('./template-literal');
 const {Identifier} = require('./identifier');
 
+const {Decorator} = require('../expressions/decorator');
+
 const maybeEncode = (value, {encodeDoubleQuote, encodeSingleQuote}) => {
     if (encodeSingleQuote && !value.includes('\\'))
         return value.replaceAll(`'`, `\\'`);
@@ -15,14 +17,11 @@ const maybeEncode = (value, {encodeDoubleQuote, encodeSingleQuote}) => {
 
 module.exports = {
     Identifier,
+    Decorator,
     TemplateLiteral,
     BigIntLiteral(path, {write}) {
         write(path.node.raw);
     },
-    Decorator(path, {print}) {
-        print('@');
-        print('__expression');
-    },
     NumericLiteral(path, {write}) {
         const {
             raw,

package/package.json

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