@putout/printer 1.110.0 → 1.112.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.24, v1.112.0
+
+feature:
+- 4c59494 @putout/printer: IfStatement -> ForOfStatement -> ExpressionStatement: newlines
+
+2023.05.24, v1.111.0
+
+feature:
+- c806c40 @putout/printer: ExpressionStatement inside IfStatement consequent when alternate exists: add "\n"
+
 2023.05.23, v1.110.0
 
 feature:

package/README.md

@@ -121,7 +121,8 @@ Default options produce:
 
 ```js
 if (a > 3)
-    console.log('ok');else
+    console.log('ok');
+else
     console.log('not ok');
 ```
 
@@ -142,7 +143,8 @@ And have minified code:
 
 ```js
 if (a > 3)
-    console.log('ok');else
+    console.log('ok');
+else
     console.log('not ok');
 ```
 

package/lib/tokenize/is.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const {isMarkedAfter} = require('./mark');
-
 const {
     isStringLiteral,
     isIdentifier,
@@ -20,9 +18,6 @@ const isNext = (path) => {
     if (!next.node)
         return false;
     
-    if (isMarkedAfter(path.get('body')))
-        return false;
-    
     return !next.isEmptyStatement();
 };
 

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

@@ -12,8 +12,18 @@ const {
     isCoupleLines,
 } = require('../is');
 
+const isBeforeElse = (path) => {
+    if (!path.parentPath.isIfStatement())
+        return false;
+    
+    if (path !== path.parentPath.get('consequent'))
+        return false;
+    
+    return Boolean(path.parentPath.node.alternate);
+};
+
 const satisfyAfter = satisfy([
-    isParentBlockOrNotLastOrParentLast,
+    isNotLastOrParentLast,
     isParentBlock,
     isNext,
     isNextUp,
@@ -31,6 +41,9 @@ module.exports.ExpressionStatement = {
         print('__expression');
         print(';');
         
+        if (!isNext(path))
+            return;
+        
         if (shouldBreakline(path)) {
             print.newline();
             maybe.indent(isNext(path) && noTrailingComment(path));
@@ -44,6 +57,9 @@ module.exports.ExpressionStatement = {
         if (hasTrailingComment(path) && isLast(path))
             return true;
         
+        if (isBeforeElse(path))
+            return true;
+        
         return false;
     },
     after(path, {print, maybe, store}) {
@@ -61,17 +77,11 @@ module.exports.ExpressionStatement = {
 };
 
 function isNotLastBody(path) {
-    if (!isNext(path) && isParentBlock(path))
-        return false;
-    
-    if (isLast(path) || isParentLast(path))
-        return false;
-    
     return path.parentPath.get('body') === path;
 }
 
-function isParentBlockOrNotLastOrParentLast(path) {
-    return isParentBlock(path) || !(isLast(path) || isParentLast(path));
+function isNotLastOrParentLast(path) {
+    return !(isLast(path) || isParentLast(path));
 }
 
 function isNextUp(path) {

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

@@ -15,6 +15,11 @@ const {
 
 module.exports.ForOfStatement = {
     beforeIf(path) {
+        const {parentPath} = path;
+        
+        if (!parentPath.isBlockStatement() && parentPath.isStatement())
+            return false;
+        
         return !isFirst(path) && !hasPrevNewline(path);
     },
     before(path, {print}) {

package/package.json

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