@putout/printer 1.71.1 → 1.72.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.04.26, v1.72.0
+
+feature:
+- e1ca06a @putout/printer: improve support of SwitchCase
+- 82b3293 @putout/printer: improve ability to determine linebreak in ObjectMethod
+
+2023.04.25, v1.71.2
+
+feature:
+- 9922208 @putout/printer: improve support of ForStatements newline
+
 2023.04.25, v1.71.1
 
 feature:

package/lib/tokenize/comments.js

@@ -1,7 +1,11 @@
 'use strict';
 
 const {isNext} = require('./is');
-const {markBefore, isMarkedAfter} = require('./mark');
+
+const {
+    markBefore,
+    isMarkedAfter,
+} = require('./mark');
 
 module.exports.parseLeadingComments = (path, {print, maybe, indent}) => {
     const {leadingComments} = path.node;

package/lib/tokenize/expressions/functions/object-method.js

@@ -1,24 +1,34 @@
 'use strict';
 
-module.exports.ObjectMethod = (path, {print}) => {
-    const {kind} = path.node;
-    
-    if (kind !== 'method')
-        print(`${kind} `);
-    
-    print('__key');
-    print('(');
-    
-    const params = path.get('params');
-    const n = params.length - 1;
-    
-    for (let i = 0; i <= n; i++) {
-        print(params[i]);
+const {isNewlineBetweenSiblings} = require('../../is');
+module.exports.ObjectMethod = {
+    print(path, {print}) {
+        const {kind} = path.node;
         
-        if (i < n)
-            print(', ');
-    }
-    
-    print(') ');
-    print('__body');
+        if (kind !== 'method')
+            print(`${kind} `);
+        
+        print('__key');
+        print('(');
+        
+        const params = path.get('params');
+        const n = params.length - 1;
+        
+        for (let i = 0; i <= n; i++) {
+            print(params[i]);
+            
+            if (i < n)
+                print(', ');
+        }
+        
+        print(') ');
+        print('__body');
+    },
+    afterIf(path) {
+        return isNewlineBetweenSiblings(path);
+    },
+    after(path, {print}) {
+        print.linebreak();
+    },
 };
+

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

@@ -11,6 +11,7 @@ const {
     isArrowFunctionExpression,
     isObjectMethod,
 } = require('@babel/types');
+
 const {markAfter} = require('../mark');
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();

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

@@ -5,6 +5,8 @@ const {
     isNextParent,
 } = require('../is');
 
+const insideCase = (path) => path.parentPath.isSwitchCase();
+
 module.exports.BreakStatement = {
     split(path, {print}) {
         print.newline();
@@ -20,6 +22,9 @@ module.exports.BreakStatement = {
         if (isNextParent(path))
             return true;
         
+        if (insideCase(path))
+            return true;
+        
         return false;
     },
 };

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

@@ -3,13 +3,14 @@
 const {isLast} = require('../is');
 
 module.exports.ForStatement = {
-    print(path, {print, maybe}) {
+    print(path, {print, maybe, indent}) {
         const {
             test,
             update,
             body,
         } = path.node;
         
+        indent();
         print('for (');
         print('__init');
         print(';');
@@ -31,13 +32,13 @@ module.exports.ForStatement = {
             maybe.indent.dec(is);
         }
     },
-    after(path, {print}) {
-        print.newline();
-    },
     afterIf(path) {
         if (isLast(path))
             return false;
         
         return true;
     },
+    after(path, {print}) {
+        print.linebreak();
+    },
 };

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

@@ -14,8 +14,9 @@ module.exports.IfStatement = {
         
         const consequent = path.get('consequent');
         const alternate = path.get('alternate');
+        const isConsequentBlock = consequent.isBlockStatement();
         
-        if (consequent.isBlockStatement()) {
+        if (isConsequentBlock) {
             print(' ');
             print(consequent);
         } else {
@@ -35,6 +36,7 @@ module.exports.IfStatement = {
             write.space();
             traverse(alternate);
         } else if (exists(alternate)) {
+            maybe.indent(!isConsequentBlock);
             write('else');
             print.newline();
             indent.inc();

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

@@ -27,6 +27,7 @@ module.exports.ImportDeclaration = {
                     imported,
                     local,
                 } = spec.node;
+                
                 maybe.print(index, ', ');
                 maybe.print(!wasSpecifier, '{');
                 

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

@@ -1,42 +1,54 @@
 'use strict';
 
-module.exports.SwitchStatement = (path, {print, maybe}) => {
-    print('switch');
-    print.space();
-    print('(');
-    print('__discriminant');
-    print(') {');
-    print.newline();
-    
-    const cases = path.get('cases');
-    const n = cases.length - 1;
-    
-    for (const [index, switchCase] of cases.entries()) {
-        print('case');
+const {isNext} = require('../is');
+
+module.exports.SwitchStatement = {
+    print(path, {print, maybe}) {
+        print('switch');
         print.space();
-        print(switchCase.get('test'));
-        print(':');
+        print('(');
+        print('__discriminant');
+        print(') {');
+        print.newline();
         
-        const isBlock = switchCase.get('consequent.0').isBlockStatement();
-        maybe.indent.inc(!isBlock);
-        maybe.print.newline(!isBlock);
+        const cases = path.get('cases');
+        const n = cases.length - 1;
         
-        for (const consequent of switchCase.get('consequent')) {
-            if (!consequent.isBlockStatement()) {
+        for (const [index, switchCase] of cases.entries()) {
+            print('case');
+            print.space();
+            print(switchCase.get('test'));
+            print(':');
+            
+            const isBlock = switchCase.get('consequent.0').isBlockStatement();
+            
+            maybe.indent.inc(!isBlock);
+            maybe.print.newline(!isBlock);
+            
+            for (const consequent of switchCase.get('consequent')) {
+                if (!consequent.isBlockStatement()) {
+                    print(consequent);
+                    continue;
+                }
+                
+                print.space();
                 print(consequent);
-                continue;
             }
             
-            print.space();
-            print(consequent);
-        }
-        
-        if (index < n) {
-            print.indent();
+            if (index < n) {
+                print.linebreak();
+            }
+            
             maybe.indent.dec(!isBlock);
-            print.newline();
         }
-    }
-    
-    print('}');
+        
+        print('}');
+    },
+    afterSatisfy: () => [
+        isNext,
+    ],
+    after(path, {print}) {
+        print.breakline();
+        print.breakline();
+    },
 };

package/package.json

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