@putout/printer 18.6.1 → 18.6.3

package/ChangeLog

@@ -1,3 +1,13 @@
+2026.03.14, v18.6.3
+
+feature:
+- 5837376 @putout/printer: VariableDeclration: afterIf:
+
+2026.03.13, v18.6.2
+
+feature:
+- 98623e8 @putout/printer: VariableDeclaration: beforeIf: move out
+
 2026.03.13, v18.6.1
 
 feature:

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

@@ -33,7 +33,7 @@ const isPathIsConsequent = ({node, parentPath}) => node !== parentPath.node.cons
 
 const isBeforeElse = createTypeChecker([
     ['-: parentPath -> !IfStatement'],
-    ['-:', isPathIsConsequent],
+    ['-', isPathIsConsequent],
     ['+: parentPath.node.alternate', Boolean],
 ]);
 

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

@@ -8,18 +8,37 @@ import {
     isLast,
     isNewlineBetweenSiblings,
     isNext,
+    callWithPrev,
 } from '#is';
 
-const noNextParentBlock = createTypeChecker([
-    ['-', isNext],
-    ['+', isInsideBlock],
-]);
+const isTwoLinesDifferenceWithPrev = (path) => {
+    const prev = path.getPrevSibling();
+    
+    return path.node.loc?.start.line === prev.node?.loc?.start?.line + 2;
+};
 
 const {
     isIfStatement,
     isFunctionDeclaration,
+    isVariableDeclaration,
 } = types;
 
+const isNoPrevAndNextConst = createTypeChecker([
+    ['-: ->', callWithPrev(exists)],
+    ['+', callWithNext(isVariableDeclaration)],
+]);
+
+const isNextCoupleLines = createTypeChecker([
+    ['-', isNoPrevAndNextConst],
+    ['-', isTwoLinesDifferenceWithPrev],
+    ['+', callWithNext(isCoupleLines)],
+]);
+
+const noNextParentBlock = createTypeChecker([
+    ['-', isNext],
+    ['+', isInsideBlock],
+]);
+
 const notLastCoupleLines = createTypeChecker([
     ['-', isLast],
     ['+', isCoupleLines],
@@ -52,19 +71,6 @@ export const afterIf = createTypeChecker([
     ['+: parentPath -> TSModuleBlock'],
 ]);
 
-function isNextCoupleLines(path) {
-    const next = path.getNextSibling();
-    const prev = path.getPrevSibling();
-    
-    if (!exists(prev.getPrevSibling()) && next.isVariableDeclaration())
-        return false;
-    
-    if (path.node.loc?.start.line === prev.node?.loc?.start?.line + 2)
-        return false;
-    
-    return isCoupleLines(next);
-}
-
 function notLastPrevVarNotNextVar(path) {
     const prev = path.getPrevSibling();
     const next = path.getNextSibling();

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

@@ -0,0 +1,13 @@
+import {types} from '@putout/babel';
+import {createTypeChecker} from '#type-checker';
+import {hasPrevNewline} from '#mark';
+import {callWithPrev, isFirst} from '#is';
+
+const {isBlockStatement} = types;
+
+export const beforeIf = createTypeChecker([
+    ['-', isFirst],
+    ['-', hasPrevNewline],
+    ['-: parentPath ->', hasPrevNewline],
+    ['+', callWithPrev(isBlockStatement)],
+]);

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

@@ -1,12 +1,9 @@
-import {types} from '@putout/babel';
-import {hasPrevNewline} from '#mark';
 import {createTypeChecker} from '#type-checker';
 import {isConcatenation} from '#is-concatenation';
 import {maybeDeclare} from '#maybe-declare';
 import {parseLeadingComments} from '#comments';
 import {
     isNext,
-    isCoupleLines,
     isNewlineBetweenSiblings,
     exists,
     noTrailingComment,
@@ -17,16 +14,13 @@ import {
     isInsideSwitchCase,
     isInsideBody,
     callWithParent,
+    isLast,
 } from '#is';
 import {afterIf} from './after-if.js';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
-
-const {isExportDeclaration} = types;
-
-const isLast = (path) => path.parentPath?.isProgram() && !isNext(path);
+import {beforeIf} from './before-if.js';
 
 const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
-
 const isInsideBlockLike = createTypeChecker([
     isInsideProgram,
     isInsideBlock,
@@ -61,7 +55,7 @@ const isNeedNewline = createTypeChecker([
 ]);
 
 export const VariableDeclaration = {
-    beforeIf: shouldAddNewlineBefore,
+    beforeIf,
     before(path, {print}) {
         print.breakline();
     },
@@ -138,25 +132,3 @@ const skipAfter = createTypeChecker([
     ['-: parentPath -> !', isLast],
     ['+: -> !', isInsideBlock],
 ]);
-
-function shouldAddNewlineBefore(path) {
-    if (isFirst(path))
-        return false;
-    
-    if (hasPrevNewline(path))
-        return false;
-    
-    if (hasPrevNewline(path.parentPath))
-        return false;
-    
-    const prevPath = path.getPrevSibling();
-    
-    if (prevPath.isStatement() && !prevPath.isExpressionStatement() && !prevPath.isBlockStatement())
-        return false;
-    
-    return !isExportDeclaration(path.parentPath) && isCoupleLines(path);
-}
-
-function isFirst(path) {
-    return path.node === path.parentPath.node.body?.[0];
-}

package/package.json

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