@putout/printer 5.16.0 → 5.18.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.10.02, v5.18.0
+
+feature:
+- cc10a48 @putout/printer: maybe
+
+2023.10.02, v5.17.0
+
+feature:
+- 2b343e6 @putout/printer: ClassBody: comments
+
 2023.10.02, v5.16.0
 
 feature:

package/lib/tokenize/expressions/array-pattern.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {maybeTypeAnnotation} = require('../literals/maybe-type-annotation');
+const {maybeTypeAnnotation} = require('../maybe/maybe-type-annotation');
 const isForOf = ({parentPath}) => parentPath.parentPath.parentPath?.isForOfStatement();
 
 module.exports.ArrayPattern = maybeTypeAnnotation((path, {indent, maybe, print}, options) => {

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

@@ -1,8 +1,8 @@
 'use strict';
 
 const {exists} = require('../../is');
-const {maybePrintTypeAnnotation} = require('../../literals/maybe-type-annotation');
-const {maybeDecorators} = require('./maybe-decorators');
+const {maybePrintTypeAnnotation} = require('../../maybe/maybe-type-annotation');
+const {maybeDecorators} = require('../../maybe/maybe-decorators');
 
 const processClassProperty = maybeDecorators((path, printer, semantics, {accessor} = {}) => {
     const {print, maybe} = printer;

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

@@ -3,22 +3,18 @@
 const {isNext} = require('../../is');
 const {markAfter} = require('../../mark');
 const {maybeDecorators} = require('../../maybe-get');
-const {maybeDeclare} = require('../../typescript/namespace/maybeDeclare');
+const {maybeDeclare} = require('../../maybe/maybe-declare');
+const {parseComments} = require('../../comment/comment');
 
 const isInsideExport = ({parentPath}) => parentPath.isExportDeclaration();
 
 module.exports.ClassExpression = classVisitor;
 
 module.exports.ClassDeclaration = {
-    print: maybeDeclare((path, {print, indent, maybe, traverse}) => {
+    print: maybeDeclare((path, printer, semantics) => {
+        const {indent} = printer;
         indent();
-        
-        classVisitor(path, {
-            print,
-            indent,
-            maybe,
-            traverse,
-        });
+        classVisitor(path, printer, semantics);
     }),
     afterIf(path) {
         if (!isNext(path))
@@ -36,8 +32,14 @@ module.exports.ClassDeclaration = {
     },
 };
 
-function classVisitor(path, {print, indent, maybe, traverse}) {
+function classVisitor(path, printer, semantics) {
     const {id, abstract} = path.node;
+    const {
+        print,
+        indent,
+        maybe,
+        traverse,
+    } = printer;
     
     for (const decorator of maybeDecorators(path)) {
         traverse(decorator);
@@ -69,13 +71,18 @@ function classVisitor(path, {print, indent, maybe, traverse}) {
     maybe.print.newline(path.node.body.body.length);
     indent.inc();
     
-    const body = path.get('body.body');
+    const classBody = path.get('body');
+    const body = classBody.get('body');
     
     for (const item of body) {
         indent();
         traverse(item);
     }
     
+    if (!body.length) {
+        parseComments(classBody, printer, semantics);
+    }
+    
     indent.dec();
     maybe.indent(body.length);
     print('}');

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

@@ -2,7 +2,7 @@
 
 const {isNext} = require('../../is');
 const {printParams} = require('./params');
-const {maybeDecorators} = require('../class/maybe-decorators');
+const {maybeDecorators} = require('../../maybe/maybe-decorators');
 
 const ClassMethod = {
     print: maybeDecorators((path, printer, semantics) => {

package/lib/tokenize/expressions/object-pattern/object-pattern.js

@@ -15,7 +15,7 @@ const {
 } = require('../../is');
 
 const {checkMaxPropertiesInOneLine} = require('./max-properties-in-one-line');
-const {maybeTypeAnnotation} = require('../../literals/maybe-type-annotation');
+const {maybeTypeAnnotation} = require('../../maybe/maybe-type-annotation');
 
 const isTwoLevelsDeep = ({parentPath}) => parentPath.parentPath.parentPath.isObjectProperty();
 

package/lib/tokenize/expressions/rest-element.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {maybeTypeAnnotation} = require('../literals/maybe-type-annotation');
+const {maybeTypeAnnotation} = require('../maybe/maybe-type-annotation');
 
 module.exports.RestElement = maybeTypeAnnotation((path, {print}) => {
     print('...');

package/lib/tokenize/literals/identifier.js

@@ -2,7 +2,7 @@
 
 const {maybeDecorators} = require('../maybe-get');
 const {maybeParens} = require('../expressions/function/parens');
-const {maybeTypeAnnotation} = require('./maybe-type-annotation');
+const {maybeTypeAnnotation} = require('../maybe/maybe-type-annotation');
 
 module.exports.Identifier = maybeParens(maybeTypeAnnotation((path, printer) => {
     const {

package/lib/tokenize/{expressions/class → maybe}/maybe-decorators.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isPrev} = require('../../is');
+const {isPrev} = require('../is');
 
 module.exports.maybeDecorators = (visitor) => (path, printer, semantics, options) => {
     const {

package/lib/tokenize/statements/variable-declaration/variable-declaration.js

@@ -14,7 +14,7 @@ const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
 
 const {isConcatenation} = require('../../expressions/binary-expression/concatanate');
 const {parseLeadingComments} = require('../../comment/comment');
-const {maybeDeclare} = require('../../typescript/namespace/maybeDeclare');
+const {maybeDeclare} = require('../../maybe/maybe-declare');
 
 const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);

package/lib/tokenize/typescript/function/ts-method-signature.js

@@ -20,4 +20,3 @@ module.exports.TSMethodSignature = (path, printer, semantics) => {
         printReturnType(path, printer);
     }
 };
-

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

@@ -6,7 +6,7 @@ const {
 } = require('@putout/babel').types;
 
 const {isNext, isNextParent} = require('../../is');
-const {maybeDeclare} = require('../namespace/maybeDeclare');
+const {maybeDeclare} = require('../../maybe/maybe-declare');
 
 module.exports.TSInterfaceDeclaration = {
     print: maybeDeclare((path, {print, indent}) => {
@@ -26,4 +26,3 @@ module.exports.TSInterfaceDeclaration = {
             print.breakline();
     },
 };
-

package/lib/tokenize/typescript/namespace/ts-module-declaration.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {isNext} = require('../../is');
-const {maybeDeclare} = require('./maybeDeclare');
+const {maybeDeclare} = require('../../maybe/maybe-declare');
 
 module.exports.TSModuleDeclaration = {
     print: maybeDeclare((path, {print}) => {

package/lib/tokenize/typescript/ts-property-signature.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {maybeTypeAnnotation} = require('../literals/maybe-type-annotation');
+const {maybeTypeAnnotation} = require('../maybe/maybe-type-annotation');
 
 module.exports.TSPropertySignature = maybeTypeAnnotation((path, {print, maybe}) => {
     const {optional} = path.node;

package/lib/tokenize/typescript/type/ts-type-alias-declaration.js

@@ -2,7 +2,7 @@
 
 const {isLast} = require('../../is');
 const {markAfter} = require('../../mark');
-const {maybeDeclare} = require('../namespace/maybeDeclare');
+const {maybeDeclare} = require('../../maybe/maybe-declare');
 const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
 
 module.exports.TSTypeAliasDeclaration = {

package/package.json

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