@putout/printer 7.1.2 → 7.3.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.12.18, v7.3.0
+
+fix:
+- 541b97e @putout/printer: isIndented: no loc
+
+2023.12.14, v7.2.0
+
+feature:
+- 389b695 @putout/printer: var inside if (coderaiser/putout#194)
+
 2023.12.12, v7.1.2
 
 feature:

package/README.md

@@ -9,7 +9,10 @@
 [CoverageURL]: https://coveralls.io/github/putoutjs/printer?branch=master
 [CoverageIMGURL]: https://coveralls.io/repos/putoutjs/printer/badge.svg?branch=master&service=github
 
-Prints [**Babel AST**](https://github.com/coderaiser/estree-to-babel) to readable **JavaScript**. For **ESTree** use [`estree-to-babel`](https://github.com/coderaiser/estree-to-babel).
+Prints [**Babel AST**](https://github.com/coderaiser/estree-to-babel) to readable **JavaScript**.
+Use 🐊[**Putout**](https://github.com/coderaiser/putout) to parse your code.
+
+You may also use [Babel 8](https://github.com/putoutjs/babel) with [`estree-to-babel`](https://github.com/coderaiser/estree-to-babel) for **ESTree** and **Babel AST** to put `.extra.raw` to `.raw` (which is simpler for transforms, no need to use [Optional Chaining](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Optional_chaining) and add extra values every time).
 
 - ☝️ Similar to **Recast**, but [twice faster](#speed-comparison), also simpler and easier in maintenance, since it supports only **Babel**.
 - ☝️ As opinionated as **Prettier**, but has more user-friendly output and works directly with **AST**.
@@ -52,7 +55,7 @@ To benefit from it.
 
 ```js
 const {print} = require('@putout/printer');
-const {parse} = require('@babel/parser');
+const {parse} = require('putout');
 const ast = parse('const a = (b, c) => {const d = 5; return a;}');
 
 print(ast);

package/lib/tokenize/is.js

@@ -43,7 +43,7 @@ module.exports.isParentLast = (path) => isLast(path.parentPath);
 
 module.exports.isIndented = (path = {}) => {
     const {parentPath, node} = path;
-    return node.loc.start.column !== parentPath.node.loc.start.column;
+    return node.loc?.start.column !== parentPath.node.loc.start.column;
 };
 module.exports.isCoupleLines = isCoupleLines;
 

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

@@ -32,6 +32,7 @@ module.exports.IfStatement = {
         const consequent = path.get('consequent');
         const alternate = path.get('alternate');
         const isConsequentBlock = consequent.isBlockStatement();
+        const isVar = consequent.isVariableDeclaration();
         
         if (isConsequentBlock) {
             print.space();
@@ -41,8 +42,10 @@ module.exports.IfStatement = {
                 maybe.print.newline(isEmptyBody(consequent));
         } else {
             const is = !isEmptyConsequent(path);
+            
             maybe.print.newline(is);
             maybe.indent.inc(is);
+            maybe.indent(isVar);
             print(consequent);
             maybe.indent.dec(is);
         }
@@ -56,6 +59,7 @@ module.exports.IfStatement = {
             write(' else ');
             traverse(alternate);
         } else if (exists(alternate)) {
+            maybe.write.newline(isVar);
             maybe.indent(!isConsequentBlock);
             maybe.write.space(isConsequentBlock);
             write('else');

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

@@ -1,11 +1,10 @@
 'use strict';
 
-const {markAfter} = require('../../mark');
+const {parseImportSpecifiers} = require('parse-import-specifiers');
 
+const {markAfter} = require('../../mark');
 const {isLast, isNext} = require('../../is');
 
-const {parseImportSpecifiers} = require('parse-import-specifiers');
-
 const {
     maybePrintAttributes,
     ImportAttribute,

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

@@ -21,6 +21,7 @@ const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parent
 const isInsideBlock = (path) => /^(Program|BlockStatement|TSModuleBlock)$/.test(path.parentPath.type);
 const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
 const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
+const isParentIf = (path) => path.parentPath.isIfStatement();
 
 module.exports.VariableDeclaration = {
     beforeIf: shouldAddNewlineBefore,
@@ -73,7 +74,7 @@ module.exports.VariableDeclaration = {
         
         maybe.indent.dec(n);
         
-        if (isParentBlock(path) || isParentSwitchCase(path) || isParentTSModuleBlock(path))
+        if (isParentBlock(path) || isParentSwitchCase(path) || isParentTSModuleBlock(path) || isParentIf(path))
             write(';');
         
         let wasNewline = false;

package/package.json

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