@putout/printer 18.6.0 → 18.6.2

package/ChangeLog

@@ -1,3 +1,14 @@
+2026.03.13, v18.6.2
+
+feature:
+- 98623e8 @putout/printer: VariableDeclaration: beforeIf: move out
+
+2026.03.13, v18.6.1
+
+feature:
+- 07e38ad @putout/printer: VariableDeclaration: afterIf: move out
+- 30cfca1 @putout/printer: VariableDeclaration: isNeedNewline: simplify
+
 2026.03.13, v18.6.0
 
 feature:

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

@@ -0,0 +1,79 @@
+import {types} from '@putout/babel';
+import {createTypeChecker} from '#type-checker';
+import {
+    exists,
+    callWithNext,
+    isCoupleLines,
+    isInsideBlock,
+    isLast,
+    isNewlineBetweenSiblings,
+    isNext,
+} from '#is';
+
+const noNextParentBlock = createTypeChecker([
+    ['-', isNext],
+    ['+', isInsideBlock],
+]);
+
+const {
+    isIfStatement,
+    isFunctionDeclaration,
+} = types;
+
+const notLastCoupleLines = createTypeChecker([
+    ['-', isLast],
+    ['+', isCoupleLines],
+]);
+
+const isNextAssign = (path) => {
+    const nextPath = path.getNextSibling();
+    
+    if (!nextPath.isExpressionStatement())
+        return false;
+    
+    const {parentPath} = path;
+    
+    if (parentPath.isBlockStatement() && parentPath.node.body.length < 3)
+        return false;
+    
+    return nextPath.get('expression').isAssignmentExpression();
+};
+
+export const afterIf = createTypeChecker([
+    ['+', callWithNext(isIfStatement)],
+    ['+', callWithNext(isFunctionDeclaration)],
+    ['+', noNextParentBlock],
+    ['+', notLastCoupleLines],
+    ['+', isNextAssign],
+    ['+', isNextCoupleLines],
+    ['+', notLastPrevVarNotNextVar],
+    ['+', isNewlineBetweenSiblings],
+    ['+: parentPath -> ExportNamedDeclaration'],
+    ['+: 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();
+    
+    if (!exists(prev.getPrevSibling()))
+        return false;
+    
+    if (path.node.loc?.start.line === prev.node?.loc?.start.line + 2)
+        return false;
+    
+    return !isLast(path) && prev.isVariableDeclaration() && !next.isVariableDeclaration();
+}

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,28 +1,26 @@
-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,
     isInsideIf,
     isInsideBlock,
-    isInsideExportDeclaration,
     isInsideTSModuleBlock,
     isInsideProgram,
     isInsideSwitchCase,
     isInsideBody,
     callWithParent,
+    isLast,
 } from '#is';
+import {afterIf} from './after-if.js';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
+import {beforeIf} from './before-if.js';
 
-const {isExportDeclaration} = types;
-
+const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isInsideBlockLike = createTypeChecker([
     isInsideProgram,
     isInsideBlock,
@@ -31,11 +29,7 @@ const isInsideBlockLike = createTypeChecker([
     isInsideBody,
 ]);
 
-const isLast = (path) => path.parentPath?.isProgram() && !isNext(path);
-
-const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
-const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
 
 const isInsideParentLike = callWithParent(createTypeChecker([
     'Program',
@@ -53,6 +47,7 @@ const isNeedSemicolon = createTypeChecker([
 ]);
 
 const isNeedNewline = createTypeChecker([
+    ['+', isParentSwitchCase],
     ['-: -> !', isInsideParentLike],
     ['-: -> !', isNext],
     ['+', noTrailingComment],
@@ -60,7 +55,7 @@ const isNeedNewline = createTypeChecker([
 ]);
 
 export const VariableDeclaration = {
-    beforeIf: shouldAddNewlineBefore,
+    beforeIf,
     before(path, {print}) {
         print.breakline();
     },
@@ -113,13 +108,6 @@ export const VariableDeclaration = {
         
         let wasNewline = false;
         
-        if (isParentSwitchCase(path)) {
-            write.newline();
-            
-            if (!isFirstInSwitch(path))
-                wasNewline = true;
-        }
-        
         if (isNeedNewline(path)) {
             write.newline();
             wasNewline = true;
@@ -127,18 +115,7 @@ export const VariableDeclaration = {
         
         store(wasNewline);
     }),
-    afterSatisfy: () => [
-        isNextIf,
-        isNextFn,
-        noNextParentBlock,
-        notLastCoupleLines,
-        isNextAssign,
-        isNextCoupleLines,
-        notLastPrevVarNotNextVar,
-        isNewlineBetweenSiblings,
-        isInsideExportDeclaration,
-        isParentTSModuleBlock,
-    ],
+    afterIf,
     after(path, {maybe, store, print}) {
         const wasNewline = store();
         
@@ -155,85 +132,3 @@ const skipAfter = createTypeChecker([
     ['-: parentPath -> !', isLast],
     ['+: -> !', isInsideBlock],
 ]);
-
-const noNextParentBlock = createTypeChecker([
-    ['-', isNext],
-    ['+', isInsideBlock],
-]);
-
-const notLastCoupleLines = createTypeChecker([
-    ['-', isLast],
-    ['+', isCoupleLines],
-]);
-
-function notLastPrevVarNotNextVar(path) {
-    const prev = path.getPrevSibling();
-    const next = path.getNextSibling();
-    
-    if (!exists(prev.getPrevSibling()))
-        return false;
-    
-    if (path.node.loc?.start.line === prev.node?.loc?.start.line + 2)
-        return false;
-    
-    return !isLast(path) && prev.isVariableDeclaration() && !next.isVariableDeclaration();
-}
-
-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 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];
-}
-
-const isNextIf = (path) => {
-    const nextPath = path.getNextSibling();
-    return nextPath.isIfStatement();
-};
-
-const isNextFn = (path) => {
-    const nextPath = path.getNextSibling();
-    return nextPath.isFunctionDeclaration();
-};
-
-const isNextAssign = (path) => {
-    const nextPath = path.getNextSibling();
-    
-    if (!nextPath.isExpressionStatement())
-        return false;
-    
-    const {parentPath} = path;
-    
-    if (parentPath.isBlockStatement() && parentPath.node.body.length < 3)
-        return false;
-    
-    return nextPath.get('expression').isAssignmentExpression();
-};

package/package.json

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