@putout/printer 1.25.0 → 1.25.1

package/ChangeLog

@@ -1,3 +1,10 @@
+2023.04.06, v1.25.1
+
+feature:
+- 3250fd6 @putout/printer: improve chaining
+- 8d302ba @putout/printer: improve format of ArrayExpression tuple
+- 4970dd9 @putout/printer: ForOfStatement: newline
+
 2023.04.06, v1.25.0
 
 feature:

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

@@ -2,14 +2,22 @@
 
 const {round} = Math;
 
-const {isObjectProperty} = require('@babel/types');
-const {isCoupleLines} = require('../is');
+const {
+    isObjectProperty,
+    isStringLiteral,
+    isArrayExpression,
+} = require('@babel/types');
+
+const {
+    isCoupleLines,
+    isStringAndIdentifier,
+} = require('../is');
+
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 const SECOND = 1;
-
-const isStringAndArray = ([a, b]) => a?.isStringLiteral() && b?.isArrayExpression();
-const isStringAndIdentifier = ([a, b]) => a?.isStringLiteral() && b?.isIdentifier();
+const isStringAndArray = ([a, b]) => isStringLiteral(a) && isArrayExpression(b);
 const isArrayParent = (path) => path.parentPath.isArrayExpression();
+
 const isTwoLongStrings = ([a, b]) => {
     const LONG_STRING = 20;
     
@@ -22,42 +30,78 @@ const isTwoLongStrings = ([a, b]) => {
     return false;
 };
 
-module.exports.ArrayExpression = (path, {print, maybe, indent}) => {
-    const elements = path.get('elements');
-    const shouldIncreaseIndent = isIncreaseIndent(path);
-    
-    print('[');
-    
-    if (!isTwoLongStrings(elements))
-        maybe.indent.inc(!shouldIncreaseIndent);
-    
-    const isNewLine = isNewlineBetweenElements(path, {elements});
-    const n = elements.length - 1;
-    
-    maybe.print.newline(isNewLine && elements.length);
-    
-    for (const [index, element] of elements.entries()) {
-        maybe.indent(isNewLine);
-        print(element);
-        maybe.print(isNewLine, ',');
-        maybe.print.newline(isNewLine);
-        maybe.print(!isNewLine && index < n, ', ');
-    }
-    
-    if (!isTwoLongStrings(elements))
-        maybe.indent.dec(!shouldIncreaseIndent);
-    
-    const parentElements = path.parentPath.get('elements');
-    
-    if (isArrayParent(path) && isStringAndArray(parentElements)) {
+module.exports.ArrayExpression = {
+    beforeIf(path) {
+        const {parentPath} = path;
+        const {elements} = path.node;
+        
+        if (!parentPath.isArrayExpression())
+            return false;
+        
+        if (isCoupleLines(parentPath))
+            return false;
+        
+        return isStringAndIdentifier(elements);
+    },
+    before(path, {print}) {
+        print.breakline();
+    },
+    print(path, {print, maybe, indent}) {
+        const elements = path.get('elements');
+        const shouldIncreaseIndent = isIncreaseIndent(path);
+        
+        print('[');
+        
+        if (!isTwoLongStrings(elements))
+            maybe.indent.inc(!shouldIncreaseIndent);
+        
+        const isNewLine = isNewlineBetweenElements(path, {
+            elements,
+        });
+        const n = elements.length - 1;
+        
+        maybe.print.newline(isNewLine && elements.length);
+        
+        for (const [index, element] of elements.entries()) {
+            maybe.indent(isNewLine);
+            print(element);
+            maybe.print(isNewLine, ',');
+            maybe.print.newline(isNewLine);
+            maybe.print(!isNewLine && index < n, ', ');
+        }
+        
+        if (!isTwoLongStrings(elements))
+            maybe.indent.dec(!shouldIncreaseIndent);
+        
+        const parentElements = path.parentPath.get('elements');
+        
+        if (isArrayParent(path) && isStringAndArray(parentElements)) {
+            indent.dec();
+            maybe.indent(elements.length && isNewLine);
+            indent.inc();
+        } else {
+            maybe.indent(elements.length && isNewLine);
+        }
+        
+        print(']');
+    },
+    afterIf(path) {
+        const {parentPath} = path;
+        const {elements} = path.node;
+        
+        if (!parentPath.isArrayExpression())
+            return false;
+        
+        if (isCoupleLines(parentPath))
+            return false;
+        
+        return isStringAndIdentifier(elements);
+    },
+    after(path, {print, indent}) {
         indent.dec();
-        maybe.indent(elements.length && isNewLine);
+        print.breakline();
         indent.inc();
-    } else {
-        maybe.indent(elements.length && isNewLine);
-    }
-    
-    print(']');
+    },
 };
 
 function isNumbers(elements) {
@@ -151,8 +195,10 @@ function isTwoStringsDifferentLength(strings) {
     if (!a?.isStringLiteral() || !b?.isStringLiteral())
         return false;
     
-    const aLength = a.node.value.length;
-    const bLength = b.node.value.length;
+    const aLength = a
+        .node.value.length;
+    const bLength = b
+        .node.value.length;
     
     return round(bLength / aLength) > 2;
 }
@@ -173,4 +219,3 @@ function isInsideLoop(path) {
     
     return true;
 }
-

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

@@ -75,7 +75,10 @@ function looksLikeChain(path) {
     if (!itMember && !path.parentPath.isExpressionStatement() && !parentPath.isCallExpression())
         return false;
     
-    if (parentPath.isCallExpression() && parentPath.get('callee') !== path)
+    if (!parentPath.isCallExpression())
+        return false;
+    
+    if (parentPath.get('callee') !== path)
         return false;
     
     if (compare(parentPath, '__a.__b(__args);') && !itMember && !itExpression)

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

@@ -1,10 +1,15 @@
 'use strict';
 
 const {isCoupleLines} = require('../is');
-const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
-const isLogical = (path) => path.get('argument').isLogicalExpression();
-const isValue = (path) => path.get('properties.0.value').node;
-const isIf = (path) => path.parentPath.parentPath.isIfStatement();
+
+const isBodyOfArrow = (path) => path
+    .parentPath.node.body === path.node;
+const isLogical = (path) => path
+    .get('argument').isLogicalExpression();
+const isValue = (path) => path
+    .get('properties.0.value').node;
+const isIf = (path) => path
+    .parentPath.parentPath.isIfStatement();
 const isParentExpression = (path) => path.parentPath.isExpressionStatement();
 
 const isForOf = (path) => {
@@ -61,7 +66,8 @@ function shouldAddNewline(path) {
     if (!path.parentPath.isLogicalExpression())
         return false;
     
-    return path.parentPath.parentPath.isSpreadElement();
+    return path
+        .parentPath.parentPath.isSpreadElement();
 }
 module.exports.ObjectProperty = (path, {print, maybe}) => {
     const {

package/lib/tokenize/is.js

@@ -1,6 +1,10 @@
 'use strict';
 
 const {isMarkedAfter} = require('./mark');
+const {
+    isStringLiteral,
+    isIdentifier,
+} = require('@babel/types');
 const isParentProgram = (path) => path.parentPath?.isProgram();
 const isParentBlock = (path) => path.parentPath.isBlockStatement();
 
@@ -40,3 +44,5 @@ function isCoupleLines(path) {
 function isNextCoupleLines(path) {
     return isCoupleLines(path.getNextSibling());
 }
+
+module.exports.isStringAndIdentifier = ([a, b]) => isStringLiteral(a) && isIdentifier(b);

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

@@ -4,6 +4,7 @@ const {
     hasPrevNewline,
     markAfter,
     markBefore,
+    isMarkedAfter,
 } = require('../mark');
 
 const {
@@ -20,7 +21,7 @@ module.exports.ForOfStatement = {
         print.newline();
         markBefore(path);
     },
-    print(path, {indent, print, maybe}) {
+    print(path, {indent, print, maybe, traverse}) {
         indent();
         print('for (');
         print('__left');
@@ -33,7 +34,10 @@ module.exports.ForOfStatement = {
         if (bodyPath.isExpressionStatement()) {
             indent.inc();
             print.newline();
-            print('__body');
+            traverse(bodyPath);
+            
+            maybe.markAfter(isMarkedAfter(bodyPath), path);
+            
             indent.dec();
             maybe.print.newline(isNext(path));
             

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "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",