@putout/printer 2.73.0 → 2.74.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.07.15, v2.74.0
+
+feature:
+- e6b07a5 @putout/printer: TSTypePredicate: add
+
+2023.07.14, v2.73.1
+
+feature:
+- 08a8d1f ConditionalExpression: simplify
+
 2023.07.14, v2.73.0
 
 feature:

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

@@ -3,7 +3,7 @@
 const isParens = (path) => path.node.extra?.parenthesized;
 
 module.exports.ConditionalExpression = {
-    beforeSatisfy: () => [isParens],
+    condition: isParens,
     before(path, {print}) {
         print('(');
     },
@@ -18,7 +18,6 @@ module.exports.ConditionalExpression = {
         print.space();
         print('__alternate');
     },
-    afterSatisfy: () => [isParens],
     after(path, {print}) {
         print(')');
     },

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

@@ -1,16 +1,17 @@
 'use strict';
 
 const {markAfter} = require('../../mark');
-
 const {isNext, isNextParent} = require('../../is');
-
 const {printParams} = require('./params');
 
 module.exports.FunctionDeclaration = {
     print(path, printer, semantics) {
         const {print, maybe} = printer;
-        
-        const {async, generator} = path.node;
+        const {
+            async,
+            generator,
+            returnType,
+        } = path.node;
         
         maybe.print(async, 'async ');
         
@@ -22,8 +23,12 @@ module.exports.FunctionDeclaration = {
         
         printParams(path, printer, semantics);
         
-        print.space();
+        if (returnType) {
+            print(': ');
+            print('__returnType');
+        }
         
+        print.space();
         print('__body');
     },
     afterSatisfy: () => [isNext, isNextParent],

package/lib/tokenize/typescript/index.js

@@ -176,20 +176,14 @@ module.exports = {
         
         print('__typeAnnotation');
     },
-    TSConstructSignatureDeclaration(path, {write, traverse, maybe}) {
-        write('new');
-        write('(');
-        
-        const params = path.get('parameters');
-        const n = params.length - 1;
+    TSConstructSignatureDeclaration(path, printer, semantics) {
+        const {write, traverse} = printer;
         
-        for (const [index, param] of params.entries()) {
-            traverse(param);
-            maybe.write(index < n, ',');
-            maybe.write.space(index < n);
-        }
+        write('new');
+        printParams(path, printer, semantics, {
+            params: path.get('parameters'),
+        });
         
-        write(')');
         const typeAnnotation = path.get('typeAnnotation');
         
         if (exists(typeAnnotation)) {
@@ -214,20 +208,13 @@ module.exports = {
         print.space();
         print('__typeAnnotation');
     },
-    TSMethodSignature(path, {traverse, write, maybe}) {
-        traverse(path.get('key'));
-        write('(');
-        
-        const params = path.get('parameters');
-        const n = params.length - 1;
+    TSMethodSignature(path, printer, semantics) {
+        const {traverse, write} = printer;
         
-        for (const [index, param] of params.entries()) {
-            traverse(param);
-            maybe.write(index < n, ',');
-            maybe.write.space(index < n);
-        }
-        
-        write(')');
+        traverse(path.get('key'));
+        printParams(path, printer, semantics, {
+            params: path.get('parameters'),
+        });
         
         const typeAnnotation = path.get('typeAnnotation');
         
@@ -243,4 +230,9 @@ module.exports = {
     },
     TSPropertySignature,
     TSFunctionType,
+    TSTypePredicate(path, {print}) {
+        print('__parameterName');
+        print(' is ');
+        print('__typeAnnotation');
+    },
 };

package/package.json

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