@putout/printer 1.54.0 → 1.54.2

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.04.18, v1.54.2
+
+feature:
+- a9c17af @putout/printer: improve support of ArrowFunctionExpression used inside LogicalExpression
+
+2023.04.18, v1.54.1
+
+feature:
+- 7f6d7d4 @putout/printer: add support of Import used as object of MemberExpression
+- c2b2e4b @putout/printer: VariableDeclaration: drop useless newline
+
 2023.04.18, v1.54.0
 
 feature:

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

@@ -19,4 +19,3 @@ module.exports.AssignmentExpression = {
         write(')');
     },
 };
-

package/lib/tokenize/expressions/functions/arrow-function-expression.js

@@ -0,0 +1,46 @@
+'use strict';
+
+const {exists} = require('../../is');
+
+module.exports.ArrowFunctionExpression = {
+    condition({parentPath}) {
+        return parentPath.isLogicalExpression();
+    },
+    before(path, {write}) {
+        write('(');
+    },
+    print(path, {print, maybe, write, traverse}) {
+        const {async} = path.node;
+        
+        maybe.print(async, 'async ');
+        print('(');
+        
+        const params = path.get('params');
+        const n = params.length;
+        
+        for (let i = 0; i < n; i++) {
+            print(params[i]);
+            
+            if (i < n - 1)
+                print(', ');
+        }
+        
+        print(')');
+        
+        const returnType = path.get('returnType');
+        
+        if (exists(returnType)) {
+            write(':');
+            write.space();
+            traverse(returnType);
+        }
+        
+        print.space();
+        print('=>');
+        print.space();
+        print('__body');
+    },
+    after(path, {write}) {
+        write(')');
+    },
+};

package/lib/tokenize/expressions/{functions.js → functions/functions.js}

@@ -1,8 +1,10 @@
 'use strict';
 
-const {hasPrevNewline} = require('../mark');
-const {exists} = require('../is');
+const {hasPrevNewline} = require('../../mark');
 const isFirst = (path) => !path.getPrevSibling().node;
+const {ArrowFunctionExpression} = require('./arrow-function-expression');
+
+module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
 
 module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
     const {node} = path;
@@ -39,38 +41,6 @@ module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
     print('__body');
 };
 
-module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
-
-function ArrowFunctionExpression(path, {print, maybe, write, traverse}) {
-    const {async} = path.node;
-    maybe.print(async, 'async ');
-    print('(');
-    
-    const params = path.get('params');
-    const n = params.length;
-    
-    for (let i = 0; i < n; i++) {
-        print(params[i]);
-        
-        if (i < n - 1)
-            print(', ');
-    }
-    
-    print(')');
-    
-    const returnType = path.get('returnType');
-    
-    if (exists(returnType)) {
-        write(':');
-        write.space();
-        traverse(returnType);
-    }
-    
-    print.space();
-    print('=>');
-    print.space();
-    print('__body');
-}
 module.exports.ObjectMethod = (path, {print}) => {
     const {kind} = path.node;
     

package/lib/tokenize/expressions/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const functions = require('./functions');
+const functions = require('./functions/functions');
 const unaryExpressions = require('./unary-expressions');
 const memberExpressions = require('./member-expressions');
 

package/lib/tokenize/expressions/member-expressions.js

@@ -12,9 +12,14 @@ const {
     getTemplateValues,
 } = require('@putout/compare');
 
-module.exports.MemberExpression = (path, {print, indent, maybe}) => {
+module.exports.MemberExpression = (path, {print, indent, maybe, traverse}) => {
     const {computed} = path.node;
-    print('__object');
+    const object = path.get('object');
+    const isObjectAwait = object.isAwaitExpression();
+    
+    maybe.print(isObjectAwait, '(');
+    traverse(object);
+    maybe.print(isObjectAwait, ')');
     
     if (computed) {
         print('[');

package/lib/tokenize/is.js

@@ -78,10 +78,9 @@ module.exports.isNewlineBetweenStatements = (path) => {
 };
 
 module.exports.satisfy = (conditions) => (path) => {
-    for (const condition of conditions) {
+    for (const condition of conditions)
         if (condition(path))
             return true;
-    }
     
     return false;
 };

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

@@ -28,7 +28,7 @@ module.exports.ExpressionStatement = {
         }
     },
     afterSatisfy: () => [
-        isParentOrNotLastORParentLast,
+        isParentBlockOrNotLastOrParentLast,
         isParentBlock,
         isNext,
         isNextUp,
@@ -49,7 +49,7 @@ function isNotLastBody(path) {
     return path.parentPath.get('body') === path;
 }
 
-function isParentOrNotLastORParentLast(path) {
+function isParentBlockOrNotLastOrParentLast(path) {
     return isParentBlock(path) || !(isLast(path) || isParentLast(path));
 }
 

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

@@ -121,6 +121,11 @@ const isNextAssign = (path) => {
     if (!nextPath.isExpressionStatement())
         return false;
     
+    const {parentPath} = path;
+    
+    if (parentPath.isBlockStatement() && parentPath.node.body.length < 3)
+        return false;
+    
     return nextPath
         .get('expression').isAssignmentExpression();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.54.0",
+  "version": "1.54.2",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",