@putout/printer 1.6.10 → 1.6.12

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.03.22, v1.6.12
+
+feature:
+- 59b18a0 @putout/printer: simplify mark
+
+2023.03.22, v1.6.11
+
+feature:
+- 552e272 @putout/printer: improve support of ArrayExpression
+
 2023.03.22, v1.6.10
 
 feature:

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

@@ -1,8 +1,10 @@
 'use strict';
 
 const {isObjectProperty} = require('@babel/types');
+const {isCoupleLines} = require('../is');
 const {entries} = Object;
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
+const SECOND = 1;
 
 module.exports.ArrayExpression = (path, {print, maybe}) => {
     const elements = path.get('elements');
@@ -11,23 +13,20 @@ module.exports.ArrayExpression = (path, {print, maybe}) => {
     print('[');
     maybe.indent.inc(!elementIsObject);
     
-    const isNewLine = !isNumbers(elements) && !isForOf(path) && isLastArg(path) && !isParentProperty(path);
+    const isNewLine = !elementIsObject && isNewLineBefore(path, {elements});
     const n = elements.length - 1;
     
     maybe.print(isNewLine && elements.length, '\n');
     
     for (const [index, element] of entries(elements)) {
         maybe.indent(isNewLine);
-        
         print(element);
-        
         maybe.print(isNewLine, ',\n');
         maybe.print(!isNewLine && index < n, ', ');
     }
     
     maybe.indent.dec(!elementIsObject);
     maybe.indent(elements.length && isNewLine);
-    
     print(']');
 };
 
@@ -62,5 +61,32 @@ function isElementObject(path) {
     if (!elements.length)
         return false;
     
-    return elements[0].isObjectExpression();
+    if (elements[0].isObjectExpression())
+        return true;
+    
+    if (elements.length > 1 && elements[SECOND].isObjectExpression())
+        return true;
+    
+    return false;
+}
+
+function tooLong(path) {
+    const elements = path.get('elements');
+    
+    if (elements.length < 2)
+        return false;
+    
+    for (const el of path.get('elements')) {
+        if (el.isStringLiteral() && el.node.value.length > 4)
+            return true;
+    }
+    
+    return false;
+}
+
+function isNewLineBefore(path, {elements}) {
+    if (tooLong(path) || isCoupleLines(path) || !isNumbers(elements) && !isForOf(path) && isLastArg(path) && !isParentProperty(path))
+        return true;
+    
+    return false;
 }

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

@@ -5,27 +5,9 @@ module.exports.AssignmentExpression = (path, {print}) => {
     const left = path.get('left');
     const right = path.get('right');
     
-    if (shouldAddNewLine(path))
-        print('\n');
-    
     print(left);
     print(' ');
     print(operator);
     print(' ');
     print(right);
 };
-
-function shouldAddNewLine({parentPath}) {
-    const prevPath = parentPath.getPrevSibling();
-    const prevPrevPath = prevPath.getPrevSibling();
-    
-    const twoPrev = prevPath.node && prevPrevPath.node;
-    
-    if (!twoPrev)
-        return false;
-    
-    if (prevPath.isExpressionStatement() && prevPath.get('expression').isAssignmentExpression())
-        return false;
-    
-    return true;
-}

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

@@ -2,7 +2,7 @@
 
 const {
     isMarkedParentBefore,
-    isMarkedPrevAfter,
+    hasPrevNewline,
 } = require('../mark');
 
 module.exports.OptionalCallExpression = (path, {indent, print, maybe}) => {
@@ -20,7 +20,7 @@ module.exports.CallExpression = CallExpression;
 function CallExpression(path, {indent, print, maybe}) {
     const isParentCall = toLong(path) && path.parentPath.isCallExpression();
     
-    if (shouldAddNewLine(path) && !isMarkedParentBefore(path) && !isMarkedPrevAfter(path.parentPath))
+    if (isNewLineBefore(path) && !isMarkedParentBefore(path) && !hasPrevNewline(path.parentPath))
         print.breakline();
     
     print(path.get('callee'));
@@ -56,7 +56,7 @@ function CallExpression(path, {indent, print, maybe}) {
     print(')');
 }
 
-function shouldAddNewLine({parentPath}) {
+function isNewLineBefore({parentPath}) {
     if (!parentPath.isExpressionStatement())
         return false;
     

package/lib/tokenize/expressions/functions.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const {isMarkedPrevAfter} = require('../mark');
+const {hasPrevNewline} = require('../mark');
+
 const isFirst = (path) => !path.getPrevSibling().node;
 
 module.exports.FunctionExpression = (path, {print, maybe}) => {
@@ -31,10 +32,10 @@ module.exports.FunctionExpression = (path, {print, maybe}) => {
 };
 
 module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
+
 function ArrowFunctionExpression(path, {print, maybe}) {
     const {async} = path.node;
     maybe.print(async, 'async ');
-    
     print('(');
     
     const params = path.get('params');
@@ -72,11 +73,10 @@ module.exports.ObjectMethod = (path, {print}) => {
 module.exports.FunctionDeclaration = (path, {print, maybe}) => {
     const {async} = path.node;
     
-    if (!isFirst(path) && !isMarkedPrevAfter(path) && !path.parentPath.isExportDeclaration())
+    if (!isFirst(path) && !hasPrevNewline(path) && !path.parentPath.isExportDeclaration())
         print('\n');
     
     maybe.print(async, 'async ');
-    
     print('function ');
     print(path.get('id'));
     print('(');
@@ -112,4 +112,3 @@ module.exports.ClassMethod = (path, {print}) => {
     print(') ');
     print(path.get('body'));
 };
-

package/lib/tokenize/expressions/index.js

@@ -19,6 +19,7 @@ const {AssignmentPattern} = require('./assignment-pattern');
 const {RestElement} = require('./rest-element');
 const {SpreadElement} = require('./spread-element');
 const {SequenceExpression} = require('./sequence-expression');
+const {TaggedTemplateExpression} = require('./tagged-template-expression');
 
 module.exports = {
     ...functions,
@@ -37,6 +38,7 @@ module.exports = {
     RestElement,
     SpreadElement,
     SequenceExpression,
+    TaggedTemplateExpression,
     BinaryExpression(path, {traverse, write}) {
         traverse(path.get('left'));
         write(` ${path.node.operator} `);

package/lib/tokenize/expressions/tagged-template-expression.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports.TaggedTemplateExpression = (path, {print}) => {
+    print('__tag');
+    print('__quasi');
+};

package/lib/tokenize/mark.js

@@ -13,7 +13,6 @@ function markBefore(path) {
 function markAfter(path) {
     path[WATER_MARK_AFTER] = true;
 }
-
 module.exports.isMarkedBefore = isMarkedBefore;
 module.exports.isMarkedAfter = isMarkedAfter;
 
@@ -32,7 +31,3 @@ module.exports.hasPrevNewline = (path) => {
 module.exports.isMarkedParentBefore = (path) => {
     return isMarkedBefore(path.parentPath);
 };
-
-module.exports.isMarkedPrevAfter = (path) => {
-    return isMarkedAfter(path.getPrevSibling());
-};

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

@@ -3,12 +3,13 @@
 const {
     markBefore,
     markAfter,
-    isMarkedPrevAfter,
+    hasPrevNewline,
 } = require('../mark');
+
 const {isNext} = require('../is');
 
 module.exports.ExpressionStatement = (path, {write, indent, traverse, print}) => {
-    if (isCoupleLinesExpression(path) && !isFirst(path) && shouldAddNewLine(path) && !isMarkedPrevAfter(path)) {
+    if (isCoupleLinesExpression(path) && !isFirst(path) && shouldAddNewLine(path) && !hasPrevNewline(path)) {
         print.breakline();
         markBefore(path);
     }
@@ -27,8 +28,8 @@ module.exports.ExpressionStatement = (path, {write, indent, traverse, print}) =>
 };
 
 function isCoupleLinesExpression(path) {
-    const start = path.node.loc?.start.line;
-    const end = path.node.loc?.end.line;
+    const start = path.node.loc?.start?.line;
+    const end = path.node.loc?.end?.line;
     
     return end > start;
 }
@@ -62,4 +63,3 @@ function shouldAddNewLine(path) {
     
     return true;
 }
-

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

@@ -1,10 +1,11 @@
 'use strict';
 
-const {isMarkedPrevAfter} = require('../mark');
+const {hasPrevNewline} = require('../mark');
+
 const {isFirst} = require('../is');
 
 module.exports.ForOfStatement = (path, {indent, print}) => {
-    if (!isFirst(path) && !isMarkedPrevAfter(path)) {
+    if (!isFirst(path) && !hasPrevNewline(path)) {
         print.indent();
         print.newline();
     }
@@ -31,4 +32,3 @@ module.exports.ForOfStatement = (path, {indent, print}) => {
         print(bodyPath);
     }
 };
-

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

@@ -1,7 +1,14 @@
 'use strict';
 
-const {isNext, isCoupleLines} = require('../is');
-const {hasPrevNewline, markAfter} = require('../mark');
+const {
+    isNext,
+    isCoupleLines,
+} = require('../is');
+const {
+    hasPrevNewline,
+    markAfter,
+} = require('../mark');
+
 const isNextAssign = (path) => {
     const nextPath = path.getNextSibling();
     
@@ -12,7 +19,7 @@ const isNextAssign = (path) => {
 };
 
 module.exports.VariableDeclaration = (path, {maybe, print}) => {
-    if (!isFirst(path) && shouldAddNewLine(path) && !hasPrevNewline(path))
+    if (!isFirst(path) && shouldAddNewLineBefore(path) && !hasPrevNewline(path))
         print.breakline();
     
     const isParentBlock = /Program|BlockStatement/.test(path.parentPath.type);
@@ -28,18 +35,36 @@ module.exports.VariableDeclaration = (path, {maybe, print}) => {
     maybe.print(isParentBlock, ';');
     maybe.print.newline(isParentBlock);
     
-    const is = isNext(path) && isCoupleLines(path) && !isNextAssign(path);
+    const is = shouldAddNewLineAfter(path);
     
     if (is) {
         print.linebreak();
         markAfter(path);
     }
-    
-    if (path.parentPath.isProgram() && !isNext(path))
-        print.linebreak();
 };
 
-function shouldAddNewLine(path) {
+function shouldAddNewLineAfter(path) {
+    if (isLast(path))
+        return true;
+    
+    if (!isNext(path))
+        return false;
+    
+    if (isCoupleLines(path))
+        return true;
+    
+    if (isNextAssign(path))
+        return true;
+    
+    if (isCoupleLines(path.getNextSibling()))
+        return true;
+    
+    return false;
+}
+
+const isLast = (path) => path.parentPath.isProgram() && !isNext(path);
+
+function shouldAddNewLineBefore(path) {
     const prevPath = path.getPrevSibling();
     
     if (prevPath.isStatement() && !prevPath.isExpressionStatement() && !prevPath.isBlockStatement())
@@ -53,7 +78,6 @@ function shouldAddNewLine(path) {
     
     const nextPath = path.getNextSibling();
     const nextNextPath = nextPath.getNextSibling();
-    
     const twoNext = nextPath.node && nextNextPath.node;
     
     if (!twoNext)
@@ -65,4 +89,3 @@ function shouldAddNewLine(path) {
 function isFirst(path) {
     return path.node === path.parentPath.node.body[0];
 }
-

package/package.json

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