@putout/printer 2.0.1 → 2.1.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.12, v2.1.0
+
+feature:
+- 2a0f610 @putout/printer: add maxVariablesInOneLine
+
+2023.06.12, v2.0.2
+
+feature:
+- 56c4cdd @putout/printer: improve handling of comments
+
 2023.06.12, v2.0.1
 
 fix:

package/README.md

@@ -88,6 +88,7 @@ write(ast, {
         comments: true,
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 3,
+        maxVariablesInOneLine: 4,
     },
     visitors: {
         AssignmentPattern(path, {write}) {

package/lib/tokenize/comments.js

@@ -8,8 +8,8 @@ const {
 const {markBefore} = require('./mark');
 const {isVariableDeclarator} = require('@babel/types');
 
-module.exports.parseLeadingComments = (path, {print, maybe, indent}, format = {}) => {
-    if (!format.comments)
+module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
+    if (!semantics.comments)
         return;
     
     const {leadingComments} = path.node;
@@ -55,8 +55,8 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, format = {}
     }
 };
 
-module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
-    if (!format.comments)
+module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
+    if (!semantics.comments)
         return;
     
     const {trailingComments} = path.node;
@@ -84,7 +84,10 @@ module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
     }
 };
 
-module.exports.parseComments = (path, {write}) => {
+module.exports.parseComments = (path, {write}, semantics) => {
+    if (!semantics.comments)
+        return;
+    
     const comments = path.node.comments || path.node.innerComments;
     
     if (!comments)

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

@@ -18,7 +18,7 @@ const isLogical = (path) => path.get('argument').isLogicalExpression();
 const isValue = (path) => path.get('properties.0.value').node;
 const isParentExpression = (path) => path.parentPath.isExpressionStatement();
 
-module.exports.ObjectExpression = (path, {print, maybe, indent, write}) => {
+module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantics) => {
     indent.inc();
     
     const properties = path.get('properties');
@@ -30,7 +30,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent, write}) => {
     print('{');
     parseComments(path, {
         write,
-    });
+    }, semantics);
     maybe.print.newline(manyLines);
     
     for (const property of properties) {

package/lib/tokenize/overrides.js

@@ -31,6 +31,7 @@ function initSemantics(semantics = {}) {
         comments: true,
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 5,
+        maxVariablesInOneLine: 4,
         ...semantics,
     };
 }

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

@@ -19,7 +19,7 @@ const isFirstStatement = (path) => path.get('body.0')?.isStatement();
 const isMethodOrArrow = (path) => isArrowFunctionExpression(path) || isObjectMethod(path);
 
 module.exports.BlockStatement = {
-    print(path, {indent, maybe, print, write}) {
+    print(path, {indent, maybe, print, write}, semantics) {
         const body = path.get('body');
         
         if (path.parentPath.isBlockStatement())
@@ -37,7 +37,7 @@ module.exports.BlockStatement = {
         
         parseComments(path, {
             write,
-        });
+        }, semantics);
         
         indent.dec();
         maybe.indent(body.length);

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

@@ -24,6 +24,7 @@ module.exports.VariableDeclaration = {
         print.breakline();
     },
     print(path, {maybe, store, write, traverse, print, indent}, semantics) {
+        const {maxVariablesInOneLine} = semantics;
         maybe.indent(isInsideBlock(path));
         write(path.node.kind);
         maybeSpaceAfterKeyword(path, {
@@ -53,13 +54,18 @@ module.exports.VariableDeclaration = {
                 const next = declarations[index + 1];
                 
                 write(',');
+                
+                if (!next.node.leadingComments) {
+                    maybe.write.breakline(n > maxVariablesInOneLine);
+                    maybe.write.space(n <= maxVariablesInOneLine);
+                    continue;
+                }
+                
                 parseLeadingComments(next, {
                     print,
                     maybe,
                     indent,
                 }, semantics);
-                
-                maybe.write.breakline(!next.node.leadingComments);
             }
         }
         
@@ -172,4 +178,3 @@ const isNextAssign = (path) => {
         .get('expression')
         .isAssignmentExpression();
 };
-

package/package.json

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