@putout/printer 1.6.12 → 1.7.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.03.23, v1.7.0
+
+feature:
+- 789d21b @putout/printer: improve support of AssignmentPattern
+
+2023.03.22, v1.6.13
+
+feature:
+- 3e3905a @putout/printer: AssignmentExpression: simplify
+
 2023.03.22, v1.6.12
 
 feature:

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

@@ -2,12 +2,10 @@
 
 module.exports.AssignmentExpression = (path, {print}) => {
     const {operator} = path.node;
-    const left = path.get('left');
-    const right = path.get('right');
     
-    print(left);
+    print('__left');
     print(' ');
     print(operator);
     print(' ');
-    print(right);
+    print('__right');
 };

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

@@ -1,6 +1,9 @@
 'use strict';
 
-module.exports.AssignmentPattern = (path, {print}) => {
+const isArg = (path) => path.parentPath.isFunction();
+
+module.exports.AssignmentPattern = (path, {print, maybe}) => {
+    maybe.print(isArg(path), '__left');
     print(' = ');
     print('__right');
 };

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

@@ -26,21 +26,23 @@ module.exports.BlockStatement = (path, {indent, maybe, print}) => {
         print(',');
     }
     
-    const shouldAddNewLine = !isNewLineAdded(path);
+    const shouldAddNewLine = isAddNewLineAfter(path);
     
-    maybe.print.newline(shouldAddNewLine);
+    if (shouldAddNewLine) {
+        print.newline();
+    }
 };
 
-function isNewLineAdded(path) {
+function isAddNewLineAfter(path) {
     const {parentPath} = path;
     
     if (isTry(path) || /FunctionExpression/.test(path.parentPath.type))
-        return true;
+        return false;
     
     if (parentPath.isIfStatement() && parentPath.get('consequent').node === path.node && parentPath.node.alternate)
-        return true;
+        return false;
     
-    return false;
+    return true;
 }
 
 function isTry({parentPath}) {

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const {hasPrevNewline} = require('../mark');
+const {hasPrevNewline, markAfter} = require('../mark');
 
 const {isFirst} = require('../is');
 
@@ -25,10 +25,18 @@ module.exports.ForOfStatement = (path, {indent, print}) => {
         print(bodyPath);
         indent.dec();
         print.newline();
+        
+        return;
     }
     
     if (bodyPath.isBlockStatement()) {
         print(' ');
         print(bodyPath);
     }
+    
+    if (path.getNextSibling().node) {
+        print.indent();
+        print.newline();
+        markAfter(path);
+    }
 };

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

@@ -1,25 +1,25 @@
 'use strict';
 
 const {isPrevBody} = require('../is');
+const {hasPrevNewline} = require('../mark');
 const isBodyLength = ({parentPath}) => parentPath.node?.body?.length > 2;
 
-module.exports.ReturnStatement = (path, {indent, write, traverse}) => {
-    if (isBodyLength(path) || isPrevBody(path)) {
-        write.indent();
-        write.newline();
+module.exports.ReturnStatement = (path, {indent, traverse, print}) => {
+    if (!hasPrevNewline(path) && isBodyLength(path) || isPrevBody(path)) {
+        print.indent();
+        print.newline();
     }
     
     indent();
-    write('return');
+    print('return');
     
     const argPath = path.get('argument');
     
     if (argPath.node) {
-        write(' ');
+        print(' ');
         traverse(argPath);
     }
     
-    write(';');
-    write.newline();
+    print(';');
+    print.newline();
 };
-

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

@@ -19,8 +19,9 @@ const isNextAssign = (path) => {
 };
 
 module.exports.VariableDeclaration = (path, {maybe, print}) => {
-    if (!isFirst(path) && shouldAddNewLineBefore(path) && !hasPrevNewline(path))
+    if (!isFirst(path) && isNewLineBefore(path) && !hasPrevNewline(path)) {
         print.breakline();
+    }
     
     const isParentBlock = /Program|BlockStatement/.test(path.parentPath.type);
     
@@ -64,7 +65,7 @@ function shouldAddNewLineAfter(path) {
 
 const isLast = (path) => path.parentPath.isProgram() && !isNext(path);
 
-function shouldAddNewLineBefore(path) {
+function isNewLineBefore(path) {
     const prevPath = path.getPrevSibling();
     
     if (prevPath.isStatement() && !prevPath.isExpressionStatement() && !prevPath.isBlockStatement())

package/lib/tokenize/tokenize.js

@@ -7,6 +7,7 @@ const statements = require('./statements');
 const literals = require('./literals');
 const {TYPES} = require('../types');
 const {createDebug} = require('./debug');
+
 const {
     maybeMarkAfter,
     maybeMarkBefore,
@@ -15,6 +16,7 @@ const {
 const {parseComments} = require('./comments');
 const isString = (a) => typeof a === 'string';
 const {assign} = Object;
+
 const traversers = {
     ...expressions,
     ...statements,
@@ -35,6 +37,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
     const format = initFormat(overrides.format);
     const tokens = [];
     const debug = createDebug(tokens);
+    
     const write = (value) => {
         tokens.push({
             type: TYPES.TOKEN,
@@ -47,10 +50,10 @@ module.exports.tokenize = (ast, overrides = {}) => {
     const maybeIndentDec = (a) => a && indent.dec();
     const maybeNewline = (a) => a && newline();
     const maybeBreakline = (a) => a && breakline();
-    
     let i = 0;
     const incIndent = () => ++i;
     const decIndent = () => --i;
+    
     const indent = () => {
         tokens.push({
             type: TYPES.INDENT,
@@ -132,8 +135,13 @@ module.exports.tokenize = (ast, overrides = {}) => {
         if (!path.node)
             return;
         
-        const print = createPrint(path, {write, traverse});
+        const print = createPrint(path, {
+            write,
+            traverse,
+        });
+        
         assign(print, write);
+        
         assign(printer, {
             print,
         });

package/package.json

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