@putout/printer 1.87.0 → 1.89.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2023.05.09, v1.89.0
+
+fix:
+- 17bae21 @putout/printer: rm useless condition
+
+feature:
+- bf25bda @putout/printer: ForOfStatement: newline
+
+2023.05.09, v1.88.0
+
+feature:
+- 64aa4a3 @putout/printer: add support of TSModuleDeclaration
+
 2023.05.09, v1.87.0
 
 feature:

package/lib/tokenize/expressions/class.js

@@ -71,4 +71,3 @@ function classVisitor(path, {print, indent, maybe}) {
     indent();
     print('}');
 }
-

package/lib/tokenize/statements/block-statement.js

@@ -27,7 +27,7 @@ module.exports.BlockStatement = {
         indent.inc();
         print('{');
         
-        if (body.length > 1 || isFirstStatement(path))
+        if (isFirstStatement(path))
             print.newline();
         
         for (const element of body) {

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

@@ -36,6 +36,7 @@ module.exports.ExportNamedDeclaration = {
         const {exportKind} = path.node;
         const specifiers = path.get('specifiers');
         
+        indent();
         write('export ');
         
         if (exportKind === 'type' && specifiers.length) {

package/lib/tokenize/statements/for-of-statement.js

@@ -10,6 +10,7 @@ const {
 const {
     isFirst,
     isNext,
+    isLast,
 } = require('../is');
 
 module.exports.ForOfStatement = {
@@ -34,6 +35,9 @@ module.exports.ForOfStatement = {
             print(' ');
             print('__body');
             
+            const {length} = bodyPath.node.body;
+            maybe.print.newline(!length && !isLast(path) && !isNext(path));
+            
             return;
         }
         
@@ -44,7 +48,12 @@ module.exports.ForOfStatement = {
         
         maybe.markAfter(isMarkedAfter(bodyPath), path);
     },
-    afterIf: isNext,
+    afterIf: (path) => {
+        if (isNext(path))
+            return true;
+        
+        return false;
+    },
     after(path, {print}) {
         print.linebreak();
         markAfter(path);

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

@@ -13,6 +13,7 @@ const {hasPrevNewline} = require('../mark');
 const {isExportDeclaration} = require('@babel/types');
 
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
+const isInsideBlock = (path) => /^(Program|BlockStatement)$/.test(path.parentPath.type);
 
 module.exports.VariableDeclaration = {
     beforeIf: shouldAddNewlineBefore,
@@ -20,7 +21,7 @@ module.exports.VariableDeclaration = {
         print.breakline();
     },
     print(path, {maybe, store, write, traverse}) {
-        maybe.indent(isParentBlock(path));
+        maybe.indent(isInsideBlock(path));
         write(`${path.node.kind} `);
         
         const declarations = path.get('declarations');

package/lib/tokenize/typescript/index.js

@@ -8,6 +8,11 @@ const {TSConditionalType} = require('./ts-conditional-type');
 const {TSTypeParameter} = require('./ts-type-parameter');
 const {TSDeclareFunction} = require('./ts-declare-function');
 
+const {
+    TSModuleDeclaration,
+    TSModuleBlock,
+} = require('./ts-module-declaration');
+
 module.exports = {
     TSTypeLiteral,
     TSTypeAliasDeclaration,
@@ -15,6 +20,12 @@ module.exports = {
     TSMappedType,
     TSConditionalType,
     TSDeclareFunction,
+    TSModuleDeclaration,
+    TSModuleBlock,
+    TSTypeQuery(path, {print}) {
+        print('typeof ');
+        print('__exprName');
+    },
     TSNeverKeyword(path, {write}) {
         write('never');
     },

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

@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports.TSModuleBlock = (path, {print, traverse, indent}) => {
+    print('{');
+    print.breakline();
+    indent.inc();
+    
+    for (const child of path.get('body'))
+        traverse(child);
+    
+    indent.dec();
+    print('}');
+};
+
+module.exports.TSModuleDeclaration = (path, {print}) => {
+    print('declare namespace ');
+    print('__id');
+    print.space();
+    print('__body');
+};

package/package.json

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