@putout/printer 1.85.0 → 1.87.0

package/ChangeLog

@@ -1,3 +1,14 @@
+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:
+- d4e3b07 @putout/printer: ifStatement: space
+
 2023.05.08, v1.85.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();
     
@@ -57,3 +71,4 @@ function classVisitor(path, {print, indent, maybe}) {
     indent();
     print('}');
 }
+

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/expressions/unary-expressions.js

@@ -37,7 +37,7 @@ function printUnary(path, name, {print}) {
     print('__argument');
 }
 
-const isWord = (a) => /delete|typeof|void/.test(a);
+const isWord = (a) => /^(delete|typeof|void)$/.test(a);
 
 function unaryExpression(path, {maybe, traverse}) {
     const {

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

@@ -8,7 +8,9 @@ const isEmptyConsequent = (path) => path.get('consequent').isEmptyStatement();
 module.exports.IfStatement = {
     print: (path, {indent, print, maybe, write, traverse}) => {
         indent();
-        print('if (');
+        print('if');
+        print.space();
+        print('(');
         print('__test');
         print(')');
         

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/package.json

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