@putout/printer 2.4.0 → 2.6.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.13, v2.6.0
+
+fix:
+- 30e2aa1 @putout/printer: ObjectExpression: used as argument call
+
+2023.06.12, v2.5.0
+
+feature:
+- 1810515 @putout/printer: WhileStatement: maybe
+
 2023.06.12, v2.4.0
 
 feature:

package/lib/tokenize/expressions/object-expression/object-expression.js

@@ -12,6 +12,7 @@ const {
 } = require('../../is');
 
 const {parseComments} = require('../../comments');
+const {isObjectExpression} = require('@babel/types');
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
@@ -28,9 +29,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantic
     
     maybe.print(parens, '(');
     print('{');
-    parseComments(path, {
-        write,
-    }, semantics);
+    parseComments(path, {write}, semantics);
     maybe.print.newline(manyLines);
     
     for (const property of properties) {
@@ -85,6 +84,13 @@ const notLastArgInsideCall = (path) => {
     if (!parentPath.isCallExpression())
         return false;
     
+    const {properties} = path.node;
+    
+    for (const property of properties) {
+        if (isObjectExpression(property.value))
+            return false;
+    }
+    
     return path !== parentPath
         .get('arguments')
         .at(-1);

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

@@ -35,9 +35,7 @@ module.exports.BlockStatement = {
             print(element);
         }
         
-        parseComments(path, {
-            write,
-        }, semantics);
+        parseComments(path, {write}, semantics);
         
         indent.dec();
         maybe.indent(body.length);

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

@@ -61,11 +61,7 @@ module.exports.VariableDeclaration = {
                     continue;
                 }
                 
-                parseLeadingComments(next, {
-                    print,
-                    maybe,
-                    indent,
-                }, semantics);
+                parseLeadingComments(next, {print, maybe, indent}, semantics);
             }
         }
         

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

@@ -1,30 +1,32 @@
 'use strict';
 
 const {isLast} = require('../is');
+const {markAfter} = require('../mark');
 
-module.exports.WhileStatement = (path, {print, indent}) => {
-    print('while (');
-    print('__test');
-    print(')');
-    
-    if (path.node.body.body) {
-        print(' ');
-        print('__body');
-    } else {
-        indent.inc();
-        print.newline();
-        print('__body');
-        indent.dec();
-    }
-    
-    if (shouldAddNewlineAfter(path)) {
+module.exports.WhileStatement = {
+    print(path, {print, indent}) {
+        print('while (');
+        print('__test');
+        print(')');
+        
+        if (path.node.body.body) {
+            print(' ');
+            print('__body');
+        } else {
+            indent.inc();
+            print.newline();
+            print('__body');
+            indent.dec();
+        }
+    },
+    afterIf(path) {
+        if (isLast(path))
+            return false;
+        
+        return true;
+    },
+    after(path, {print}) {
         print.linebreak();
-    }
+        markAfter(path);
+    },
 };
-
-function shouldAddNewlineAfter(path) {
-    if (isLast(path))
-        return false;
-    
-    return true;
-}

package/package.json

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