@putout/printer 1.86.0 → 1.88.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.05.09, v1.88.0
+
+feature:
+- 64aa4a3 @putout/printer: add support of TSModuleDeclaration
+
+2023.05.09, v1.87.0
+
+feature:
+- 092bb3c @putout/printer: add support of StaticBlock
+- 353a550 @putout/printer: improve support of SwitchStatement
+
 2023.05.09, v1.86.0
 
 feature:

package/lib/tokenize/expressions/class.js

@@ -6,6 +6,20 @@ const {markAfter} = require('../mark');
 module.exports.ClassExpression = classVisitor;
 module.exports.ClassDeclaration = classVisitor;
 
+module.exports.StaticBlock = (path, {print, traverse}) => {
+    print('static ');
+    print('{');
+    print.breakline();
+    
+    for (const child of path.get('body')) {
+        traverse(child);
+    }
+    
+    print.indent();
+    print('}');
+    print.newline();
+};
+
 module.exports.ClassDeclaration = (path, {print, indent, maybe, write}) => {
     indent();
     

package/lib/tokenize/expressions/index.js

@@ -7,6 +7,7 @@ const memberExpressions = require('./member-expressions/member-expressions');
 const {
     ClassExpression,
     ClassDeclaration,
+    StaticBlock,
 } = require('./class');
 
 const {
@@ -62,6 +63,7 @@ module.exports = {
     RestElement,
     SpreadElement,
     SequenceExpression,
+    StaticBlock,
     TaggedTemplateExpression,
     ThisExpression(path, {print}) {
         print('this');

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

@@ -1,11 +1,15 @@
 'use strict';
 
-const {isNext} = require('../is');
+const {
+    isNext,
+    exists,
+    isLast,
+} = require('../is');
 
 module.exports.SwitchStatement = {
-    print(path, {print, maybe}) {
+    print(path, {print, maybe, indent, write, traverse}) {
+        indent();
         print('switch');
-        print.space();
         print('(');
         print('__discriminant');
         print(') {');
@@ -15,9 +19,17 @@ module.exports.SwitchStatement = {
         const n = cases.length - 1;
         
         for (const [index, switchCase] of cases.entries()) {
-            print('case');
-            print.space();
-            print(switchCase.get('test'));
+            const test = switchCase.get('test');
+            
+            indent();
+            
+            if (exists(test)) {
+                write('case ');
+                traverse(test);
+            } else {
+                write('default');
+            }
+            
             print(':');
             
             const isBlock = switchCase
@@ -37,14 +49,15 @@ module.exports.SwitchStatement = {
                 print(consequent);
             }
             
-            if (index < n) {
-                print.linebreak();
-            }
-            
             maybe.indent.dec(!isBlock);
+            maybe.write.linebreak(index < n);
         }
         
+        print.indent();
         print('}');
+        
+        if (!isNext(path) && !isLast(path))
+            print.newline();
     },
     afterSatisfy: () => [
         isNext,

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,21 @@
+'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.86.0",
+  "version": "1.88.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",