@putout/printer 2.91.0 → 2.93.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.08.01, v2.93.0
+
+feature:
+- b1d5d54 @putout/printer: TSTypeAliasDeclaration inside ExportDeclaration: newline
+
+2023.07.31, v2.92.0
+
+feature:
+- 20ecdfa @putout/printer: TSTypeAliasDeclaration: newline
+
 2023.07.31, v2.91.0
 
 feature:

package/lib/tokenize/typescript/index.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const {exists, isNext} = require('../is');
-const {TSTypeLiteral} = require('./ts-type-literal');
-const {TSTypeAliasDeclaration} = require('./ts-type-alias-declaration');
+const {TSTypeLiteral} = require('./type/ts-type-literal');
+const {TSTypeAliasDeclaration} = require('./type/ts-type-alias-declaration');
 const {TSMappedType} = require('./ts-mapped-type');
 const {TSConditionalType} = require('./ts-conditional-type');
-const {TSTypeParameter} = require('./ts-type-parameter');
+const {TSTypeParameter} = require('./type/ts-type-parameter');
 const {TSDeclareFunction} = require('./function/ts-declare-function');
 const {TSDeclareMethod} = require('./function/ts-declare-method');
 

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

@@ -1,6 +1,7 @@
 'use strict';
 
-const {isNext} = require('../../is');
+const {isNext, isNextParent} = require('../../is');
+const {isTSTypeAliasDeclaration} = require('@babel/types');
 
 module.exports.TSInterfaceDeclaration = {
     print(path, {print}) {
@@ -8,9 +9,11 @@ module.exports.TSInterfaceDeclaration = {
         print('__id');
         print('__body');
     },
-    afterSatisfy: () => [isNext],
-    after(path, {print}) {
-        print.breakline();
+    afterSatisfy: () => [isNext, isNextParent],
+    after(path, {print, maybe}) {
+        const next = path.parentPath.getNextSibling();
+        
         print.breakline();
+        maybe.print.breakline(!isTSTypeAliasDeclaration(next));
     },
 };

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

@@ -18,4 +18,3 @@ module.exports.TSTupleType = (path, {write, traverse, indent, maybe}) => {
     indent();
     write(']');
 };
-

package/lib/tokenize/typescript/{ts-type-alias-declaration.js → type/ts-type-alias-declaration.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-const {isLast} = require('../is');
-const {markAfter} = require('../mark');
+const {isLast} = require('../../is');
+const {markAfter} = require('../../mark');
 const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
 
 module.exports.TSTypeAliasDeclaration = {
@@ -20,11 +20,11 @@ module.exports.TSTypeAliasDeclaration = {
         print('__typeAnnotation');
         print(';');
         
-        const is = store(isLast(path));
+        const is = store(isLast(path) || isLast(path.parentPath));
         maybe.print.newline(!is);
     },
     afterIf(path, {store}) {
-        const last = store() || isLast(path.parentPath);
+        const last = store();
         
         if (last)
             return false;

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isNext} = require('../is');
+const {isNext} = require('../../is');
 
 module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
     const members = path.get('members');

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const {exists} = require('../is');
+const {exists} = require('../../is');
 
 module.exports.TSTypeParameter = (path, {write, traverse}) => {
     const constraint = path.get('constraint');

package/package.json

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