@putout/printer 11.3.0 → 11.5.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2024.12.15, v11.5.0
+
+feature:
+- 2224570 @putout/printer: improve support of TSInterfaceDeclaration
+- d15b999 @putout/printer: putout v37.0.1
+
+2024.12.13, v11.4.0
+
+feature:
+- 332efd1 @putout/printer: LogicalExpression inside UnaryExpression: parens
+
 2024.12.12, v11.3.0
 
 feature:

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

@@ -1,18 +1,15 @@
 'use strict';
 
-const {isParens} = require('../../maybe/maybe-parens');
+const {maybeParens} = require('../../maybe/maybe-parens');
 const {chain, isRootOk} = require('./chain');
 
-module.exports.LogicalExpression = {
+module.exports.LogicalExpression = maybeParens({
     condition(path) {
-        if (isParens(path))
+        if (path.parentPath.isUnaryExpression())
             return true;
         
         return path.parentPath.isAwaitExpression();
     },
-    before(path, {print}) {
-        print('(');
-    },
     print(path, {print, maybe}, semantics) {
         print('__left');
         
@@ -26,10 +23,7 @@ module.exports.LogicalExpression = {
         print.space();
         print('__right');
     },
-    after(path, {print}) {
-        print(')');
-    },
-};
+});
 
 function isNewLine(path, semantics) {
     const [root, count] = chain(path);

package/lib/tokenize/maybe/maybe-parens.js

@@ -1,9 +1,17 @@
 'use strict';
 
+const isFn = (a) => typeof a === 'function';
 const isParens = (path) => path.node.extra?.parenthesized;
 
 module.exports.isParens = isParens;
-module.exports.maybeParens = (print) => ({
+module.exports.maybeParens = (print) => {
+    if (isFn(print))
+        return maybeParensPrint(print);
+    
+    return maybeParensCondition(print);
+};
+
+const maybeParensPrint = (print) => ({
     condition: isParens,
     before(path, {write}) {
         write('(');
@@ -13,3 +21,8 @@ module.exports.maybeParens = (print) => ({
         write(')');
     },
 });
+
+const maybeParensCondition = ({print, condition}) => ({
+    ...maybeParensPrint(print),
+    condition: (path) => condition(path) || isParens(path),
+});

package/lib/tokenize/statements/export-declaration/export-declaration.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const {isExportNamespaceSpecifier} = require('@putout/babel').types;
+const {markAfter, isMarkedAfter} = require('../../mark');
 const {
     isNewlineBetweenSiblings,
     exists,
@@ -7,8 +9,6 @@ const {
     isLast,
 } = require('../../is');
 
-const {markAfter, isMarkedAfter} = require('../../mark');
-const {isExportNamespaceSpecifier} = require('@putout/babel').types;
 const isDeclarationNewline = (path) => isMarkedAfter(path.get('declaration'));
 const isInsideNamespace = (path) => path.parentPath.isTSModuleBlock();
 

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

@@ -1,6 +1,12 @@
 'use strict';
 
-const {isNext, isNextParent} = require('../../is');
+const {
+    isNext,
+    isNextParent,
+    isLast,
+} = require('../../is');
+
+const {markAfter} = require('../../mark');
 
 module.exports.TSEnumDeclaration = {
     beforeIf(path) {
@@ -25,10 +31,17 @@ module.exports.TSEnumDeclaration = {
         }
         
         indent.dec();
+        indent();
         print('}');
+        
+        if (isLast(path))
+            return;
+        
+        print.newline();
+        markAfter(path);
     },
     afterSatisfy: () => [isNext, isNextParent],
     after(path, {print}) {
-        print.breakline();
+        print.linebreak();
     },
 };

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

@@ -1,18 +1,22 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isTSTypeAliasDeclaration,
-    isExportDeclaration,
-} = require('@putout/babel').types;
+    isExportNamedDeclaration,
+    isTSModuleBlock,
+} = types;
 
 const {isNext, isNextParent} = require('../../is');
 const {maybeDeclare} = require('../../maybe/maybe-declare');
+const {markAfter} = require('../../mark');
+const isInsideNamespace = (path) => isTSModuleBlock(path.parentPath.parentPath);
 
 module.exports.TSInterfaceDeclaration = {
     print: maybeDeclare((path, {print, maybe}) => {
-        const {node, parentPath} = path;
+        const {node} = path;
         
-        maybe.indent(!isExportDeclaration(parentPath));
+        maybe.indent(!isExportNamedDeclaration(path.parentPath));
         print('interface ');
         print('__id');
         
@@ -28,11 +32,13 @@ module.exports.TSInterfaceDeclaration = {
     }),
     afterSatisfy: () => [isNext, isNextParent],
     after(path, {print}) {
-        print.breakline();
+        print.linebreak();
+        const exportNamed = isExportNamedDeclaration(path.parentPath);
         
-        const next = path.parentPath.getNextSibling();
+        if (exportNamed && isInsideNamespace(path))
+            markAfter(path);
         
-        if (!isTSTypeAliasDeclaration(next) && !isExportDeclaration(next))
-            print.breakline();
+        if (!exportNamed && !isTSTypeAliasDeclaration(path))
+            print.newline();
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "11.3.0",
+  "version": "11.5.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -70,7 +70,7 @@
     "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^3.0.1",
-    "putout": "^36.0.0",
+    "putout": "^37.0.1",
     "redlint": "^3.16.0",
     "samadhi": "^2.8.0",
     "supertape": "^10.0.0",