@putout/printer 2.93.0 → 2.95.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.08.02, v2.95.0
+
+feature:
+- 8c3016c @putout/printer: isBabel7
+- 79da1c9 @putout/printer: add support of babel 8 (http://next.babeljs.io/docs/v8-migration-api)
+
+2023.08.01, v2.94.0
+
+feature:
+- b12d1d8 @putout/printer: TSInterfaceDeclaration: newlines
+
 2023.08.01, v2.93.0
 
 feature:

package/lib/tokenize/expressions/{functions → function}/params.js

@@ -2,9 +2,18 @@
 
 const {parseComments} = require('../../comment/comment');
 
+const isBabel7 = (path) => path.node.parameters;
+
+function parseParams(path) {
+    if (isBabel7(path))
+        return path.get('parameters');
+    
+    return path.get('params');
+}
+
 module.exports.printParams = (path, printer, semantics, customization = {}) => {
     const {
-        params = path.get('params'),
+        params = parseParams(path),
         braceOpen = '(',
         braceClose = ')',
     } = customization;

package/lib/tokenize/expressions/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const functions = require('./functions/functions');
+const functions = require('./function/functions');
 const unaryExpressions = require('./unary-expressions');
-const memberExpressions = require('./member-expressions/member-expressions');
+const memberExpressions = require('./member-expression/member-expressions');
 
 const {
     ClassExpression,

package/lib/tokenize/typescript/function/print-return-type.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const isBabel7 = (path) => path.node.typeAnnotation;
+
+module.exports.hasReturnType = (path) => {
+    if (isBabel7(path))
+        return path.node.typeAnnotation;
+    
+    return path.node.returnType;
+};
+
+module.exports.printReturnType = (path, {traverse}) => {
+    if (isBabel7(path)) {
+        traverse(path.get('typeAnnotation'));
+        return;
+    }
+    
+    traverse(path.get('returnType'));
+};

package/lib/tokenize/typescript/function/ts-call-signature-declaration.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const {printReturnType} = require('./print-return-type');
+const {printParams} = require('../../expressions/function/params');
+
+module.exports.TSCallSignatureDeclaration = (path, printer, semantics) => {
+    const {print} = printer;
+    printParams(path, printer, semantics);
+    print(':');
+    print.space();
+    printReturnType(path, printer);
+};

package/lib/tokenize/typescript/function/ts-construct-signature-declaration.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const {printParams} = require('../../expressions/function/params');
+
+const {
+    hasReturnType,
+    printReturnType,
+} = require('./print-return-type');
+
+module.exports.TSConstructSignatureDeclaration = (path, printer, semantics) => {
+    const {write} = printer;
+    
+    write('new');
+    printParams(path, printer, semantics);
+    
+    if (hasReturnType(path)) {
+        write(':');
+        write.space();
+        printReturnType(path, printer);
+    }
+};

package/lib/tokenize/typescript/{ts-constructor-type.js → function/ts-constructor-type.js}

@@ -1,6 +1,7 @@
 'use strict';
 
-const {printParams} = require('../expressions/functions/params');
+const {printParams} = require('../../expressions/function/params');
+const {printReturnType} = require('./print-return-type');
 
 module.exports.TSConstructorType = (path, printer, semantics) => {
     const {print} = printer;
@@ -8,12 +9,9 @@ module.exports.TSConstructorType = (path, printer, semantics) => {
     print('new');
     print(' ');
     
-    printParams(path, printer, semantics, {
-        params: path.get('parameters'),
-    });
-    
+    printParams(path, printer, semantics);
     print.space();
     print('=>');
     print.space();
-    print('__typeAnnotation');
+    printReturnType(path, printer);
 };

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const {printParams} = require('../../expressions/functions/params');
+const {printParams} = require('../../expressions/function/params');
 const {isNext} = require('../../is');
 
 const isInsideExport = (path) => {

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const {printParams} = require('../../expressions/functions/params');
+const {printParams} = require('../../expressions/function/params');
 
 module.exports.TSDeclareMethod = (path, printer, semantics) => {
     const {print} = printer;

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

@@ -0,0 +1,14 @@
+'use strict';
+
+const {printParams} = require('../../expressions/function/params');
+const {printReturnType} = require('./print-return-type');
+
+module.exports.TSFunctionType = (path, printer, semantics) => {
+    const {print} = printer;
+    
+    printParams(path, printer, semantics);
+    print.space();
+    print('=>');
+    print.space();
+    printReturnType(path, printer);
+};

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

@@ -0,0 +1,21 @@
+'use strict';
+
+const {printParams} = require('../../expressions/function/params');
+
+const {
+    hasReturnType,
+    printReturnType,
+} = require('./print-return-type');
+
+module.exports.TSMethodSignature = (path, printer, semantics) => {
+    const {traverse, write} = printer;
+    
+    traverse(path.get('key'));
+    printParams(path, printer, semantics);
+    
+    if (hasReturnType(path)) {
+        write(':');
+        write.space();
+        printReturnType(path, printer);
+    }
+};

package/lib/tokenize/typescript/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {exists, isNext} = require('../is');
+const {isNext} = require('../is');
 const {TSTypeLiteral} = require('./type/ts-type-literal');
 const {TSTypeAliasDeclaration} = require('./type/ts-type-alias-declaration');
 const {TSMappedType} = require('./ts-mapped-type');
@@ -19,13 +19,16 @@ 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');
-const {printParams} = require('../expressions/functions/params');
+const {TSFunctionType} = require('./function/ts-function-type');
+const {printParams} = require('../expressions/function/params');
 const {TSEnumDeclaration} = require('./enum/ts-enum-declaration');
 const {TSEnumMember} = require('./enum/ts-enum-member');
 const {TSTupleType} = require('./tuple/ts-tuple-type');
 const {TSNamedTupleMember} = require('./tuple/ts-named-tuple-member');
-const {TSConstructorType} = require('./ts-constructor-type');
+const {TSConstructorType} = require('./function/ts-constructor-type');
+const {TSCallSignatureDeclaration} = require('./function/ts-call-signature-declaration');
+const {TSConstructSignatureDeclaration} = require('./function/ts-construct-signature-declaration');
+const {TSMethodSignature} = require('./function/ts-method-signature');
 
 module.exports = {
     TSAsExpression,
@@ -116,10 +119,12 @@ module.exports = {
     TSBooleanKeyword(path, {write}) {
         write('boolean');
     },
-    TSUnionType(path, {traverse, write}) {
+    TSUnionType(path, {traverse, write, maybe}) {
         const types = path.get('types');
         const n = types.length - 1;
         
+        maybe.write(path.node.extra?.parenthesized, '(');
+        
         for (const [i, type] of types.entries()) {
             traverse(type);
             
@@ -129,6 +134,8 @@ module.exports = {
                 write.space();
             }
         }
+        
+        maybe.write(path.node.extra?.parenthesized, ')');
     },
     TSNumberKeyword(path, {write}) {
         write('number');
@@ -170,22 +177,7 @@ module.exports = {
         
         print('__typeAnnotation');
     },
-    TSConstructSignatureDeclaration(path, printer, semantics) {
-        const {write, traverse} = printer;
-        
-        write('new');
-        printParams(path, printer, semantics, {
-            params: path.get('parameters'),
-        });
-        
-        const typeAnnotation = path.get('typeAnnotation');
-        
-        if (exists(typeAnnotation)) {
-            write(':');
-            write.space();
-            traverse(typeAnnotation);
-        }
-    },
+    TSConstructSignatureDeclaration,
     TSIndexSignature(path, {print}) {
         print('[');
         print('__parameters.0');
@@ -194,30 +186,6 @@ module.exports = {
         print.space();
         print('__typeAnnotation');
     },
-    TSCallSignatureDeclaration(path, {print}) {
-        print('(');
-        print('__parameters.0');
-        print(')');
-        print(':');
-        print.space();
-        print('__typeAnnotation');
-    },
-    TSMethodSignature(path, printer, semantics) {
-        const {traverse, write} = printer;
-        
-        traverse(path.get('key'));
-        printParams(path, printer, semantics, {
-            params: path.get('parameters'),
-        });
-        
-        const typeAnnotation = path.get('typeAnnotation');
-        
-        if (exists(typeAnnotation)) {
-            write(':');
-            write.space();
-            traverse(typeAnnotation);
-        }
-    },
     TSExpressionWithTypeArguments(path, {print}) {
         print('__expression');
         print('__typeParameters');
@@ -253,6 +221,8 @@ module.exports = {
     TSDeclareMethod,
     TSNamedTupleMember,
     TSConstructorType,
+    TSMethodSignature,
+    TSCallSignatureDeclaration,
     TSThisType(path, {print}) {
         print('this');
     },

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

@@ -1,7 +1,10 @@
 'use strict';
 
 const {isNext, isNextParent} = require('../../is');
-const {isTSTypeAliasDeclaration} = require('@babel/types');
+const {
+    isTSTypeAliasDeclaration,
+    isExportDeclaration,
+} = require('@babel/types');
 
 module.exports.TSInterfaceDeclaration = {
     print(path, {print}) {
@@ -10,10 +13,12 @@ module.exports.TSInterfaceDeclaration = {
         print('__body');
     },
     afterSatisfy: () => [isNext, isNextParent],
-    after(path, {print, maybe}) {
+    after(path, {print}) {
         const next = path.parentPath.getNextSibling();
         
         print.breakline();
-        maybe.print.breakline(!isTSTypeAliasDeclaration(next));
+        
+        if (!isTSTypeAliasDeclaration(next) && !isExportDeclaration(next))
+            print.breakline();
     },
 };

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

@@ -1,7 +1,10 @@
 'use strict';
 
+const isString = (a) => typeof a === 'string';
 const {exists} = require('../../is');
 
+const isBabel7 = (path) => isString(path.node.name);
+
 module.exports.TSTypeParameter = (path, {write, traverse}) => {
     const constraint = path.get('constraint');
     
@@ -12,7 +15,10 @@ module.exports.TSTypeParameter = (path, {write, traverse}) => {
     else if (path.node.const)
         write('const ');
     
-    write(path.node.name);
+    if (isBabel7(path))
+        write(path.node.name);
+    else
+        write(path.node.name.name);
     
     if (!exists(constraint))
         return;

package/package.json

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

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

@@ -1,15 +0,0 @@
-'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');
-};