@putout/printer 2.60.0 → 2.62.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.07.10, v2.62.0
+
+feature:
+- 3fe49ba @putout/printer: tokenize: TSIntersectionType: add
+
+2023.07.09, v2.61.0
+
+feature:
+- 500cf5d @putout/printer: SwitchCase: comments
+
 2023.07.09, v2.60.0
 
 feature:

package/lib/tokenize/comment/parse-leading-comments.js

@@ -14,13 +14,14 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
     if (!leadingComments?.length)
         return;
     
-    if (hasTrailingComment(path.getPrevSibling()))
+    const looksLikeSwitchCase = path.isSwitchCase();
+    
+    if (!looksLikeSwitchCase && hasTrailingComment(path.getPrevSibling()))
         return;
     
-    const looksLikeSwitchCase = path.isSwitchCase();
     const insideFn = path.parentPath.isFunction();
     const isProperty = path.isObjectProperty() || isVariableDeclarator(path);
-    const isIndent = looksLikeSwitchCase || !path.isClassMethod() && !insideFn && !isProperty;
+    const isIndent = !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !isProperty;
     
     for (const {type, value} of leadingComments) {
         maybe.indent(isIndent);
@@ -52,7 +53,7 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
             if (path.isStatement() || looksLikeDirective || looksLikeMethod || looksLikeProp || looksLikeSwitchCase) {
                 print.newline();
                 markBefore(path);
-                maybe.indent(looksLikeMethod || looksLikeProp);
+                maybe.indent(looksLikeMethod || looksLikeProp || looksLikeSwitchCase);
             }
             
             continue;

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/statements/switch-statement.js

@@ -5,6 +5,7 @@ const {
     exists,
     isLast,
 } = require('../is');
+
 const {parseLeadingComments} = require('../comment/comment');
 
 module.exports.SwitchStatement = {

package/lib/tokenize/typescript/index.js

@@ -16,6 +16,7 @@ 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');
 
 module.exports = {
     TSAsExpression,
@@ -27,6 +28,7 @@ module.exports = {
     TSDeclareFunction,
     TSModuleDeclaration,
     TSModuleBlock,
+    TSIntersectionType,
     TSBigIntKeyword(path, {write}) {
         write('bigint');
     },

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/package.json

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