@putout/printer 1.13.1 → 1.14.1

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.03.30, v1.14.1
+
+fix:
+- 1a117af @putout/printer: duplicate comment
+
+feature:
+- 260d680 @putout/printer: add support of getters
+
+2023.03.30, v1.14.0
+
+feature:
+- 90687b1 @putout/printer: add support of TSTypeAnnotation
+
 2023.03.29, v1.13.1
 
 feature:

package/README.md

@@ -24,7 +24,6 @@ const ast = parse('const a = (b, c) => {const d = 5; return a;}');
 
 print(ast);
 
-// returns
 // returns
 `
 const a = (b, c) => {
@@ -32,7 +31,6 @@ const a = (b, c) => {
     return a;
 };
 `;
-
 ```
 
 ## Overrides
@@ -62,10 +60,8 @@ print(ast, {
     },
 });
 
-// returns
 // returns
 'const {a /* [hello world] */= 5} = b;\n';
-
 ```
 
 ## License

package/lib/tokenize/comments.js

@@ -1,7 +1,13 @@
 'use strict';
 
-const {isFirst} = require('./is');
-const {markBefore} = require('./mark');
+const {
+    isFirst,
+    isNext,
+} = require('./is');
+const {
+    markBefore,
+    hasPrevNewline,
+} = require('./mark');
 
 module.exports.parseLeadingComments = (path, {print, indent}) => {
     const {leadingComments} = path.node;
@@ -41,6 +47,9 @@ module.exports.parseTrailingComments = (path, {print}) => {
     if (!trailingComments || !trailingComments.length)
         return;
     
+    if (isNext(path))
+        return;
+    
     for (const {type, value} of trailingComments) {
         if (type === 'CommentLine') {
             print.space();
@@ -52,5 +61,5 @@ module.exports.parseTrailingComments = (path, {print}) => {
 };
 
 function shouldAddNewlineBefore(path) {
-    return path.isStatement() && !isFirst(path);
+    return path.isStatement() && !isFirst(path) && !hasPrevNewline(path);
 }

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

@@ -1,6 +1,5 @@
 'use strict';
 
-const {entries} = Object;
 const isForOf = ({parentPath}) => parentPath.parentPath.parentPath.isForOfStatement();
 
 module.exports.ArrayPattern = (path, {indent, maybe, print}) => {
@@ -15,7 +14,7 @@ module.exports.ArrayPattern = (path, {indent, maybe, print}) => {
     
     maybe.print(isNewLine && elements.length, '\n');
     
-    for (const [index, element] of entries(elements)) {
+    for (const [index, element] of elements.entries()) {
         maybe.indent(isNewLine);
         print(element);
         maybe.print(isNewLine, ',\n');

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

@@ -5,8 +5,6 @@ const {
     hasPrevNewline,
 } = require('../mark');
 
-const {entries} = Object;
-
 const CallExpression = {
     beforeIf(path) {
         return isNewLineBefore(path) && !isMarkedParentBefore(path) && !hasPrevNewline(path.parentPath);
@@ -28,7 +26,7 @@ const CallExpression = {
         
         maybe.indent.inc(isParentCall);
         
-        for (const [i, arg] of entries(args)) {
+        for (const [i, arg] of args.entries()) {
             if (isParentCall) {
                 print.newline();
                 indent();

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

@@ -1,7 +1,5 @@
 'use strict';
 
-const {entries} = Object;
-
 module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
     indent();
     print('class ');
@@ -21,7 +19,7 @@ module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
     const body = path.get('body.body');
     const n = body.length - 1;
     
-    for (const [i, item] of entries(body)) {
+    for (const [i, item] of body.entries()) {
         indent();
         print(item);
         maybe.print(i < n, '\n');

package/lib/tokenize/expressions/functions.js

@@ -51,6 +51,11 @@ function ArrowFunctionExpression(path, {print, maybe}) {
     print('__body');
 }
 module.exports.ObjectMethod = (path, {print}) => {
+    const {kind} = path.node;
+    
+    if (kind !== 'method')
+        print(`${kind} `);
+    
     print('__key');
     print('(');
     

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

@@ -1,7 +1,6 @@
 'use strict';
 
 const {isCoupleLines} = require('../is');
-
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
 
@@ -90,4 +89,3 @@ function isOneLine(path) {
     
     return isForOf(path);
 }
-

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

@@ -1,12 +1,10 @@
 'use strict';
 
-const {entries} = Object;
-
 module.exports.SequenceExpression = (path, {maybe, print}) => {
     const expressions = path.get('expressions');
     const n = expressions.length - 1;
     
-    for (const [index, expression] of entries(expressions)) {
+    for (const [index, expression] of expressions.entries()) {
         print(expression);
         maybe.print(index < n, ',');
         maybe.print(index < n, ' ');

package/lib/tokenize/expressions/unary-expressions.js

@@ -44,6 +44,7 @@ function unaryExpression(path, {print, maybe}) {
     maybe.print(isWord(
         operator,
     ), ' ');
+    
     print('__argument');
     
     if (!prefix)

package/lib/tokenize/literals/index.js

@@ -23,8 +23,9 @@ module.exports = {
         
         write(raw || `'${value}'`);
     },
-    Identifier(path, {write}) {
+    Identifier(path, {write, print}) {
         write(path.node.name);
+        print('__typeAnnotation');
     },
     RegExpLiteral(path, {print}) {
         print(path.node.raw);

package/lib/tokenize/statements/switch-statement.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const {entries} = Object;
-
 module.exports.SwitchStatement = (path, {print, maybe}) => {
     print('switch');
     print.space();
@@ -13,7 +11,7 @@ module.exports.SwitchStatement = (path, {print, maybe}) => {
     const cases = path.get('cases');
     const n = cases.length - 1;
     
-    for (const [index, switchCase] of entries(cases)) {
+    for (const [index, switchCase] of cases.entries()) {
         print('case');
         print.space();
         print(switchCase.get('test'));

package/lib/tokenize/typescript/index.js

@@ -14,8 +14,16 @@ module.exports = {
     TSTypeReference(path, {print}) {
         print('__typeName');
     },
-    TSTypeParameter(path, {print}) {
-        print(path.node.name);
+    TSTypeParameter(path, {write}) {
+        write(path.node.name);
+    },
+    TSNumberKeyword(path, {write}) {
+        write('number');
+    },
+    TSTypeAnnotation(path, {print}) {
+        print(':');
+        print.space();
+        print('__typeAnnotation');
     },
     TSExpressionWithTypeArguments(path, {print}) {
         print('__expression');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.13.1",
+  "version": "1.14.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",