@putout/printer 6.14.0 → 6.16.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.12.03, v6.16.0
+
+feature:
+- 27a2185 @putout/printer: ReturnStatement inside IfStatement: newline
+
+2023.12.03, v6.15.0
+
+feature:
+- f05ae8a @putout/printer: MemberExpression: chain inside ifStatement
+
 2023.12.03, v6.14.0
 
 feature:

package/lib/tokenize/comment/parse-trailing-comments.js

@@ -1,6 +1,10 @@
 'use strict';
 
-const {isDecorator} = require('@putout/babel').types;
+const {
+    isDecorator,
+    isMemberExpression,
+} = require('@putout/babel').types;
+
 const {
     isLast,
     isCoupleLines,
@@ -18,7 +22,7 @@ const isTrailingIsLeading = (path) => path.node.trailingComments === path.getNex
 const isNewlineAfter = (path) => {
     const {parentPath} = path;
     
-    if (parentPath.isMemberExpression())
+    if (isMemberExpression(parentPath))
         return false;
     
     return !isLast(path) && !isDecorator(path);

package/lib/tokenize/expressions/class/class.js

@@ -28,9 +28,7 @@ const classVisitor = maybeDecorators((path, printer, semantics) => {
     
     if (node.implements) {
         print(' implements ');
-        path
-            .get('implements')
-            .forEach(print);
+        path.get('implements').forEach(print);
     }
     
     if (node.superClass) {

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

@@ -3,7 +3,6 @@
 const {
     isUnaryExpression,
     isArrowFunctionExpression,
-    isLogicalExpression,
     isIfStatement,
 } = require('@putout/babel').types;
 
@@ -65,10 +64,30 @@ const isCall = (a) => a.type === 'CallExpression';
 const isExcludedFromChain = satisfy([
     isUnaryExpression,
     isArrowFunctionExpression,
-    isLogicalExpression,
     isIfStatement,
 ]);
 
+const isIfUp = (path) => {
+    const ifPath = path.find(isIfStatement);
+    let is = false;
+    
+    if (!ifPath)
+        return is;
+    
+    ifPath
+        .get('test')
+        .traverse({
+            MemberExpression(currentPath) {
+                if (path === currentPath) {
+                    is = true;
+                    path.stop();
+                }
+            },
+        });
+    
+    return is;
+};
+
 module.exports.likeChain = likeChain;
 function likeChain(path) {
     const [root, properties] = chain(path);
@@ -76,6 +95,9 @@ function likeChain(path) {
     if (isExcludedFromChain(root))
         return false;
     
+    if (path.find(isIfUp))
+        return false;
+    
     const calls = properties.filter(isCall);
     const [firstCall] = calls;
     

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

@@ -4,7 +4,6 @@ const {markAfter} = require('../../mark');
 const {exists, isNext} = require('../../is');
 
 const isInside = ({parentPath}) => !parentPath.parentPath.isProgram();
-
 const isEmptyConsequent = (path) => path.get('consequent').isEmptyStatement();
 
 const isInsideNestedBody = ({parentPath}) => {

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

@@ -43,6 +43,9 @@ module.exports.ReturnStatement = {
         if (isLast(path))
             return false;
         
+        if (isLast(path.parentPath))
+            return false;
+        
         return noTrailingComment(path);
     },
     after(path, {print}) {

package/lib/tokenize/typescript/interface/ts-interface-declaration.js

@@ -18,9 +18,7 @@ module.exports.TSInterfaceDeclaration = {
         
         if (node.extends) {
             print(' extends ');
-            path
-                .get('extends')
-                .map(print);
+            path.get('extends').map(print);
         }
         
         print('__typeParameters');

package/package.json

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