@putout/printer 5.36.0 → 5.37.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.10.24, v5.37.0
+
+feature:
+- f01afa3 @putout/printer: TSInterfaceBody: simplify
+
 2023.10.24, v5.36.0
 
 feature:

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

@@ -1,10 +1,29 @@
 'use strict';
 
-const {hasTrailingComment} = require('../is');
+const {types} = require('@putout/babel');
+const {
+    hasTrailingComment,
+    satisfy,
+    isPrev,
+} = require('../is');
 
 const {markBefore} = require('../mark');
 const {maybeInsideFn} = require('./maybe-inside-fn');
 
+const {
+    isObjectProperty,
+    isVariableDeclarator,
+    isClassProperty,
+    isTSPropertySignature,
+} = types;
+
+const isProperty = satisfy([
+    isObjectProperty,
+    isVariableDeclarator,
+    isClassProperty,
+    isTSPropertySignature,
+]);
+
 module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
     if (!semantics.comments)
         return;
@@ -20,8 +39,9 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
         return;
     
     const insideFn = path.parentPath.isFunction();
-    const isProperty = path.isObjectProperty() || path.isVariableDeclarator() || path.isClassProperty();
-    const isIndent = !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !isProperty;
+    
+    const propIs = isProperty(path);
+    const isIndent = !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !propIs;
     
     for (const {type, value} of leadingComments) {
         maybe.indent(isIndent);
@@ -32,12 +52,12 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
                 indent,
             });
             
-            maybe.print.space(isProperty && !path.isClassProperty());
+            maybe.print.space(propIs && !path.isClassProperty());
             print(`//${value}`);
             
             const isParentSwitch = path.parentPath.isSwitchCase();
-            maybe.print.breakline(isProperty || isParentSwitch);
-            maybe.print.newline(!isProperty && !isParentSwitch);
+            maybe.print.breakline(propIs || isParentSwitch);
+            maybe.print.newline(!propIs && !isParentSwitch);
             continue;
         }
         
@@ -46,11 +66,15 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
             const looksLikeDirective = path.isDirective();
             const looksLikeProp = path.isObjectProperty();
             
+            // || path.isTSPropertySignature();
             if (looksLikeProp)
                 print.breakline();
             
             print(`/*${value}*/`);
             
+            if (isTSPropertySignature(path) && !isPrev(path))
+                print.breakline();
+            
             if (path.isStatement() || path.isTSEnumMember() || looksLikeDirective || looksLikeMethod || looksLikeProp || looksLikeSwitchCase) {
                 print.newline();
                 markBefore(path);

package/lib/tokenize/is.js

@@ -23,12 +23,18 @@ const isNext = (path) => {
     return !next.isEmptyStatement();
 };
 
+const isPrev = (path) => {
+    const next = path.getPrevSibling();
+    return next.node;
+};
+
 const isNextParent = (path) => isNext(path.parentPath);
 const isLast = (path) => isParentProgram(path) && !isNext(path);
 
 module.exports.isFirst = (path) => path.node === path.parentPath.node.body?.[0];
 module.exports.isPrevBody = (path) => path.getPrevSibling().isBlockStatement();
 module.exports.isNext = isNext;
+module.exports.isPrev = isPrev;
 module.exports.isNextParent = isNextParent;
 module.exports.isParentProgram = isParentProgram;
 module.exports.isParentBlock = isParentBlock;

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

@@ -9,4 +9,6 @@ module.exports.TSCallSignatureDeclaration = (path, printer, semantics) => {
     print(':');
     print.space();
     printReturnType(path, printer);
+    print(';');
+    print.newline();
 };

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

@@ -18,4 +18,7 @@ module.exports.TSConstructSignatureDeclaration = (path, printer, semantics) => {
         write.space();
         printReturnType(path, printer);
     }
+    
+    write(';');
+    write.newline();
 };

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

@@ -18,4 +18,7 @@ module.exports.TSMethodSignature = (path, printer, semantics) => {
         write.space();
         printReturnType(path, printer);
     }
+    
+    write(';');
+    write.newline();
 };

package/lib/tokenize/typescript/index.js

@@ -34,6 +34,7 @@ const {
     maybeParenOpen,
     maybeParenClose,
 } = require('../expressions/unary-expression/parens');
+const {maybePrintTypeAnnotation} = require('../maybe/maybe-type-annotation');
 
 module.exports = {
     TSAsExpression,
@@ -180,13 +181,14 @@ module.exports = {
         print('__typeAnnotation');
     },
     TSConstructSignatureDeclaration,
-    TSIndexSignature(path, {print}) {
+    TSIndexSignature(path, printer) {
+        const {print} = printer;
         print('[');
         print('__parameters.0');
         print(']');
-        print(':');
-        print.space();
-        print('__typeAnnotation');
+        maybePrintTypeAnnotation(path, printer);
+        print(';');
+        print.newline();
     },
     TSExpressionWithTypeArguments(path, {print}) {
         print('__expression');

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

@@ -10,12 +10,17 @@ module.exports.TSInterfaceBody = (path, {traverse, write, indent, maybe}) => {
     for (const item of body) {
         indent();
         traverse(item);
-        write(';');
-        write.newline();
     }
     
     indent.dec();
     indent();
     write('}');
-    maybe.write.newline(path.parentPath.parentPath.isTSModuleBlock());
+    maybe.write.newline(findTSModuleBlock(path));
 };
+
+function findTSModuleBlock(path) {
+    if (path.parentPath.parentPath.isTSModuleBlock())
+        return true;
+    
+    return path.parentPath.parentPath.parentPath?.isTSModuleBlock();
+}

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

@@ -9,10 +9,10 @@ const {isNext, isNextParent} = require('../../is');
 const {maybeDeclare} = require('../../maybe/maybe-declare');
 
 module.exports.TSInterfaceDeclaration = {
-    print: maybeDeclare((path, {print, indent}) => {
-        const {node} = path;
+    print: maybeDeclare((path, {print, maybe}) => {
+        const {node, parentPath} = path;
         
-        indent();
+        maybe.indent(!isExportDeclaration(parentPath));
         print('interface ');
         print('__id');
         
@@ -28,10 +28,10 @@ module.exports.TSInterfaceDeclaration = {
     }),
     afterSatisfy: () => [isNext, isNextParent],
     after(path, {print}) {
-        const next = path.parentPath.getNextSibling();
-        
         print.breakline();
         
+        const next = path.parentPath.getNextSibling();
+        
         if (!isTSTypeAliasDeclaration(next) && !isExportDeclaration(next))
             print.breakline();
     },

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

@@ -1,11 +1,32 @@
 'use strict';
 
-const {maybeTypeAnnotation} = require('../maybe/maybe-type-annotation');
+const {maybePrintTypeAnnotation} = require('../maybe/maybe-type-annotation');
 
-module.exports.TSPropertySignature = maybeTypeAnnotation((path, {print, maybe}) => {
+const {
+    hasTrailingComment,
+    isNext,
+} = require('../is');
+
+module.exports.TSPropertySignature = (path, printer) => {
+    const {
+        print,
+        maybe,
+        write,
+    } = printer;
+    
     const {optional, readonly} = path.node;
     
     maybe.print(readonly, 'readonly ');
     print('__key');
     maybe.print(optional, '?');
-});
+    
+    maybePrintTypeAnnotation(path, printer);
+    
+    if (!path.parentPath.parentPath.isTSTypeParameterInstantiation()) {
+        write(';');
+        write.newline();
+    }
+    
+    if (isNext(path) && hasTrailingComment(path))
+        write.newline();
+};

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

@@ -1,8 +1,6 @@
 'use strict';
 
-const {isNext} = require('../../is');
-
-module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
+module.exports.TSTypeLiteral = (path, {indent, traverse, write}) => {
     const members = path.get('members');
     write('{');
     
@@ -16,15 +14,11 @@ module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
     for (const member of members) {
         indent();
         traverse(member);
-        maybe.write(is, ';');
-        
-        if (is && isNext(member))
-            write.newline();
     }
     
     if (is) {
         indent.dec();
-        write.breakline();
+        write.indent();
     }
     
     write('}');

package/package.json

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