@putout/printer 5.18.0 → 5.20.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.10.02, v5.20.0
+
+feature:
+- d6a690b @putout/printer: ClassProperty: comment
+
+2023.10.02, v5.19.0
+
+feature:
+- 6c0de67 @putout/printer: ClassProperty: readonly
+
 2023.10.02, v5.18.0
 
 feature:

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

@@ -1,7 +1,6 @@
 'use strict';
 
 const {hasTrailingComment} = require('../is');
-const {isVariableDeclarator} = require('@putout/babel').types;
 
 const {markBefore} = require('../mark');
 const {maybeInsideFn} = require('./maybe-inside-fn');
@@ -21,7 +20,7 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
         return;
     
     const insideFn = path.parentPath.isFunction();
-    const isProperty = path.isObjectProperty() || isVariableDeclarator(path);
+    const isProperty = path.isObjectProperty() || path.isVariableDeclarator() || path.isClassProperty();
     const isIndent = !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !isProperty;
     
     for (const {type, value} of leadingComments) {
@@ -33,7 +32,7 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
                 indent,
             });
             
-            maybe.print.space(isProperty);
+            maybe.print.space(isProperty && !path.isClassProperty());
             print(`//${value}`);
             
             const isParentSwitch = path.parentPath.isSwitchCase();

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

@@ -5,7 +5,6 @@ const {maybePrintTypeAnnotation} = require('../../maybe/maybe-type-annotation');
 const {maybeDecorators} = require('../../maybe/maybe-decorators');
 
 const processClassProperty = maybeDecorators((path, printer, semantics, {accessor} = {}) => {
-    const {print, maybe} = printer;
     const {node} = path;
     const {
         accessibility,
@@ -13,12 +12,15 @@ const processClassProperty = maybeDecorators((path, printer, semantics, {accesso
         optional,
     } = node;
     
+    const {print, maybe} = printer;
+    
     maybe.print(accessor, 'accessor ');
     
     const value = path.get('value');
     
     maybe.print(accessibility, `${accessibility} `);
     maybe.print(node.static, 'static ');
+    maybe.print(node.readonly, 'readonly ');
     maybe.print(declare, 'declare ');
     
     print('__key');

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

@@ -2,37 +2,15 @@
 
 const {isNext} = require('../../is');
 const {markAfter} = require('../../mark');
-const {maybeDecorators} = require('../../maybe-get');
+
+//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();
 
-module.exports.ClassExpression = classVisitor;
-
-module.exports.ClassDeclaration = {
-    print: maybeDeclare((path, printer, semantics) => {
-        const {indent} = printer;
-        indent();
-        classVisitor(path, printer, semantics);
-    }),
-    afterIf(path) {
-        if (!isNext(path))
-            return false;
-        
-        return !isInsideExport(path);
-    },
-    after(path, {write}) {
-        write.newline();
-        
-        if (path.node.body.body.length) {
-            write.newline();
-            markAfter(path);
-        }
-    },
-};
-
-function classVisitor(path, printer, semantics) {
+const classVisitor = maybeDecorators((path, printer, semantics) => {
     const {id, abstract} = path.node;
     const {
         print,
@@ -41,11 +19,6 @@ function classVisitor(path, printer, semantics) {
         traverse,
     } = printer;
     
-    for (const decorator of maybeDecorators(path)) {
-        traverse(decorator);
-        print.breakline();
-    }
-    
     maybe.print(abstract, 'abstract ');
     print('class ');
     print('__id');
@@ -86,4 +59,28 @@ function classVisitor(path, printer, semantics) {
     indent.dec();
     maybe.indent(body.length);
     print('}');
-}
+});
+
+module.exports.ClassExpression = classVisitor;
+
+module.exports.ClassDeclaration = {
+    print: maybeDeclare((path, printer, semantics) => {
+        const {indent} = printer;
+        indent();
+        classVisitor(path, printer, semantics);
+    }),
+    afterIf(path) {
+        if (!isNext(path))
+            return false;
+        
+        return !isInsideExport(path);
+    },
+    after(path, {write}) {
+        write.newline();
+        
+        if (path.node.body.body.length) {
+            write.newline();
+            markAfter(path);
+        }
+    },
+};

package/lib/tokenize/is.js

@@ -23,18 +23,11 @@ const isNext = (path) => {
     return !next.isEmptyStatement();
 };
 
-const isPrev = (path) => {
-    const prev = path.getPrevSibling();
-    
-    return prev.node;
-};
-
 const isNextParent = (path) => isNext(path.parentPath);
 const isLast = (path) => isParentProgram(path) && !isNext(path);
 
 module.exports.isFirst = (path) => path.node === path.parentPath.node.body?.[0];
 module.exports.isPrevBody = (path) => path.getPrevSibling().isBlockStatement();
-module.exports.isPrev = isPrev;
 module.exports.isNext = isNext;
 module.exports.isNextParent = isNextParent;
 module.exports.isParentProgram = isParentProgram;

package/lib/tokenize/maybe/maybe-decorators.js

@@ -1,6 +1,13 @@
 'use strict';
 
-const {isPrev} = require('../is');
+const isPrevClassProperty = (path) => {
+    const prev = path.getPrevSibling();
+    
+    if (!prev.node)
+        return false;
+    
+    return prev.isClassProperty() || prev.isClassAccessorProperty();
+};
 
 module.exports.maybeDecorators = (visitor) => (path, printer, semantics, options) => {
     const {
@@ -13,7 +20,7 @@ module.exports.maybeDecorators = (visitor) => (path, printer, semantics, options
     
     if (decorators) {
         for (const decorator of path.get('decorators')) {
-            maybe.write.breakline(isPrev(path));
+            maybe.write.breakline(isPrevClassProperty(path));
             traverse(decorator);
             write.breakline();
         }

package/package.json

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