@putout/printer 1.5.3 → 1.5.4

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.03.20, v1.5.4
+
+feature:
+- 96d7056 @putout/printer: split linebreak(\s\n) and breakline(\n\s)
+
 2023.03.20, v1.5.3
 
 feature:

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

@@ -11,7 +11,7 @@ module.exports.CallExpression = (path, {indent, print, maybe}) => {
     const isParentCall = toLong(path) && path.parentPath.isCallExpression();
     
     if (shouldAddNewLine(path) && !isMarkedParentBefore(path) && !isMarkedPrevAfter(path.parentPath))
-        print.linebreak();
+        print.breakline();
     
     print(path.get('callee'));
     print('(');

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

@@ -6,7 +6,7 @@ const isFirst = (path) => path.node === path.parentPath.node.body[0];
 
 module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
     if (!isFirst(path)) {
-        print.linebreak();
+        print.breakline();
     }
     
     indent();

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

@@ -7,9 +7,9 @@ const {
 } = require('../mark');
 const {isNext} = require('../is');
 
-module.exports.ExpressionStatement = (path, {write, indent, traverse}) => {
+module.exports.ExpressionStatement = (path, {write, indent, traverse, print}) => {
     if (isCoupleLinesExpression(path) && !isFirst(path) && shouldAddNewLine(path) && !isMarkedPrevAfter(path)) {
-        write.linebreak();
+        print.breakline();
         markBefore(path);
     }
     
@@ -62,3 +62,4 @@ function shouldAddNewLine(path) {
     
     return true;
 }
+

package/lib/tokenize/statements/try-statements.js

@@ -16,7 +16,7 @@ module.exports.TryStatement = (path, {print, maybe}) => {
         print.newline();
     }
     
-    maybe.print.linebreak(isNext(path));
+    maybe.print.breakline(isNext(path));
 };
 
 module.exports.CatchClause = (path, {print}) => {

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

@@ -13,7 +13,7 @@ const isNextAssign = (path) => {
 
 module.exports.VariableDeclaration = (path, {maybe, print}) => {
     if (!isFirst(path) && shouldAddNewLine(path) && !hasPrevNewline(path))
-        print.linebreak();
+        print.breakline();
     
     const isParentBlock = /Program|BlockStatement/.test(path.parentPath.type);
     
@@ -31,8 +31,7 @@ module.exports.VariableDeclaration = (path, {maybe, print}) => {
     const is = isNext(path) && isCoupleLines(path) && !isNextAssign(path);
     
     if (is) {
-        print.indent();
-        print.newline();
+        print.linebreak();
         markAfter(path);
     }
 };

package/lib/tokenize/tokenize.js

@@ -37,7 +37,7 @@ module.exports.tokenize = (ast) => {
     const maybeIndentInc = (a) => a && indent.inc();
     const maybeIndentDec = (a) => a && indent.dec();
     const maybeNewline = (a) => a && newline();
-    const maybeLinebreak = (a) => a && linebreak();
+    const maybeBreakline = (a) => a && breakline();
     
     let i = 0;
     const incIndent = () => ++i;
@@ -55,6 +55,13 @@ module.exports.tokenize = (ast) => {
     });
     
     const linebreak = () => {
+        tokens.push({
+            type: TYPES.NEWLINE,
+            value: `${printIndent(i)}\n`,
+        });
+    };
+    
+    const breakline = () => {
         tokens.push({
             type: TYPES.NEWLINE,
             value: `\n${printIndent(i)}`,
@@ -72,6 +79,7 @@ module.exports.tokenize = (ast) => {
         indent,
         newline,
         linebreak,
+        breakline,
     });
     const print = (maybeLine) => {
         if (isString(maybeLine))
@@ -98,7 +106,7 @@ module.exports.tokenize = (ast) => {
     assign(print, write);
     assign(maybePrint, {
         newline: maybeNewline,
-        linebreak: maybeLinebreak,
+        breakline: maybeBreakline,
     });
     
     const printer = {

package/package.json

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