@putout/printer 2.61.0 → 2.63.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.07.10, v2.63.0
+
+feature:
+- d176491 @putout/printer: TSFunctionType: parameters
+
+2023.07.10, v2.62.0
+
+feature:
+- 3fe49ba @putout/printer: tokenize: TSIntersectionType: add
+
 2023.07.09, v2.61.0
 
 feature:

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

@@ -3,7 +3,7 @@
 const {exists} = require('../is');
 
 function CallExpression(path, {indent, print, maybe, traverse}) {
-    const isParentCall = toLong(path) && path.parentPath.isCallExpression();
+    const isParentCall = tooLong(path) && path.parentPath.isCallExpression();
     
     const callee = path.get('callee');
     const typeParameters = path.get('typeParameters');
@@ -58,7 +58,7 @@ function CallExpression(path, {indent, print, maybe, traverse}) {
 module.exports.OptionalCallExpression = CallExpression;
 module.exports.CallExpression = CallExpression;
 
-function toLong(path) {
+function tooLong(path) {
     const args = path.get('arguments');
     
     for (const arg of args) {

package/lib/tokenize/expressions/functions/params.js

@@ -2,7 +2,11 @@
 
 const {parseComments} = require('../../comment/comment');
 
-module.exports.printParams = (path, printer, semantics) => {
+module.exports.printParams = (path, printer, semantics, customization = {}) => {
+    const {
+        params = path.get('params'),
+    } = customization;
+    
     const {print, traverse} = printer;
     
     printBraceOpen(path, {
@@ -11,13 +15,14 @@ module.exports.printParams = (path, printer, semantics) => {
     
     parseComments(path, printer, semantics);
     
-    const params = path.get('params');
-    const n = params.length;
+    const n = params.length - 1;
     
-    for (let i = 0; i < n; i++) {
+    for (let i = 0; i <= n; i++) {
+        const isLast = i === n;
+        
         traverse(params[i]);
         
-        if (i < n - 1) {
+        if (!isLast) {
             print(',');
             print.space();
         }

package/lib/tokenize/typescript/index.js

@@ -16,6 +16,9 @@ const {
 const {TSInterfaceDeclaration} = require('./interface/ts-interface-declaration');
 const {TSAsExpression} = require('./ts-as-expression');
 const {TSInterfaceBody} = require('./interface/ts-interface-body');
+const {TSIntersectionType} = require('./ts-intersection-type');
+const {TSPropertySignature} = require('./ts-property-signature');
+const {TSFunctionType} = require('./ts-function-type');
 
 module.exports = {
     TSAsExpression,
@@ -27,6 +30,7 @@ module.exports = {
     TSDeclareFunction,
     TSModuleDeclaration,
     TSModuleBlock,
+    TSIntersectionType,
     TSBigIntKeyword(path, {write}) {
         write('bigint');
     },
@@ -159,14 +163,6 @@ module.exports = {
     TSVoidKeyword(path, {write}) {
         write('void');
     },
-    TSFunctionType(path, {print}) {
-        print('(');
-        print(')');
-        print.space();
-        print('=>');
-        print.space();
-        print('__typeAnnotation');
-    },
     TSQualifiedName(path, {print}) {
         print('__left');
         print('.');
@@ -250,17 +246,6 @@ module.exports = {
         print('__expression');
         print('__typeParameters');
     },
-    TSPropertySignature(path, {print, maybe, traverse}) {
-        const {optional} = path.node;
-        const typeAnnotation = path.get('typeAnnotation');
-        
-        print('__key');
-        maybe.print(optional, '?');
-        
-        if (exists(typeAnnotation)) {
-            print(':');
-            print.space();
-            traverse(typeAnnotation);
-        }
-    },
+    TSPropertySignature,
+    TSFunctionType,
 };

package/lib/tokenize/typescript/ts-function-type.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const {printParams} = require('../expressions/functions/params');
+
+module.exports.TSFunctionType = (path, printer, semantics) => {
+    const {print} = printer;
+    printParams(path, printer, semantics, {
+        params: path.get('parameters'),
+    });
+    print.space();
+    print('=>');
+    print.space();
+    print('__typeAnnotation');
+};
+

package/lib/tokenize/typescript/ts-intersection-type.js

@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports.TSIntersectionType = (path, {traverse, write}) => {
+    const types = path.get('types');
+    const n = types.length - 1;
+    
+    for (const [i, type] of types.entries()) {
+        const isLast = i === n;
+        
+        traverse(type);
+        
+        if (!isLast) {
+            write.space();
+            write('&');
+            write.space();
+        }
+    }
+};

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

@@ -0,0 +1,18 @@
+'use strict';
+
+const {exists} = require('../is');
+
+module.exports.TSPropertySignature = (path, {print, maybe, traverse}) => {
+    const {optional} = path.node;
+    const typeAnnotation = path.get('typeAnnotation');
+    
+    print('__key');
+    maybe.print(optional, '?');
+    
+    if (exists(typeAnnotation)) {
+        print(':');
+        print.space();
+        traverse(typeAnnotation);
+    }
+};
+

package/package.json

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