@putout/printer 18.0.0 → 18.0.2

package/ChangeLog

@@ -1,3 +1,20 @@
+2026.03.04, v18.0.2
+
+feature:
+- 854491c @putout/printer: VariableDeclaration: simplify
+
+2026.03.04, v18.0.1
+
+feature:
+- 5e6e906 @putout/printer: VariableDeclaration: after: simplify
+- 852f982 @putout/printer: @putout/plugin-printer v8.0.0
+- 7b3977d @putout/printer: VariableDeclaration: skipAfter
+- 4f43a9f VariableDeclaration: isNeedNewline
+- 9dece24 @putout/printer: VariableDeclaration: isSemicolon
+- b9a27e0 @putout/printer: VariableDeclaration: isInsideIf
+- 06d6255 @putout/printer: is: isParentProgram -> isInsideProgram
+- 2a0ef4e is: isParentBlock -> isInsideBlock
+
 2026.03.04, v18.0.0
 
 feature:

package/lib/tokenize/expressions/array-expression/newline.js

@@ -60,6 +60,7 @@ const isSiblingIsArray = (path) => {
 };
 
 const isEmptyArray = (path) => !path.node.elements.length;
+
 const isAllLiterals = (path) => {
     const {elements} = path.node;
     const literals = elements.filter(isStringLiteral);
@@ -329,4 +330,3 @@ export const isCurrentNewLine = (path) => {
     
     return !path.isObjectExpression();
 };
-

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

@@ -1,7 +1,7 @@
 import {maybeParens} from '#maybe-parens';
 import {
-    isParentBlock,
-    isParentProgram,
+    isInsideBlock,
+    isInsideProgram,
 } from '#is';
 import {condition} from './maybe-parens-condition.js';
 import {printSeparator} from './print-separator.js';
@@ -27,7 +27,7 @@ export const AssignmentExpression = maybeParens({
         printSeparator(path, printer);
         print('__right');
         
-        if (isParentBlock(path) || isParentProgram(path)) {
+        if (isInsideBlock(path) || isInsideProgram(path)) {
             print(';');
             print.breakline();
         }

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

@@ -1,4 +1,4 @@
-import {exists} from '#is';
+import {exists, isInsideCall} from '#is';
 import {maybeParens} from '#maybe-parens';
 
 const {isArray} = Array;
@@ -14,7 +14,7 @@ const parseArgs = (path) => {
 
 export const CallExpression = maybeParens((path, {indent, print, maybe, traverse}) => {
     const args = parseArgs(path);
-    const isParentCall = tooLong(args) && path.parentPath.isCallExpression();
+    const isParentCall = tooLong(args) && isInsideCall(path);
     
     const callee = path.get('callee');
     const typeParameters = path.get('typeArguments');

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

@@ -1,17 +1,17 @@
 import {types} from '@putout/babel';
+import {markAfter} from '#mark';
 import {
     hasBody,
+    isInsideExport,
     isInsideTSModuleBlock,
     isNext,
 } from '#is';
-import {markAfter} from '#mark';
 import {maybeDeclare} from '../../maybe/maybe-declare.js';
 import {parseComments} from '../../comment/comment.js';
 import {maybeDecorators} from '../../maybe/maybe-decorators.js';
 
 const {isFunction} = types;
 
-const isInsideExport = ({parentPath}) => parentPath.isExportDeclaration();
 const isFunctionLike = (path) => isFunction(path.parentPath.parentPath);
 
 const classVisitor = maybeDecorators((path, printer, semantics) => {
@@ -107,3 +107,4 @@ export const ClassDeclaration = {
         }
     },
 };
+

package/lib/tokenize/is.js

@@ -18,8 +18,8 @@ const {
     isTSModuleBlock,
 } = types;
 
-export const isParentProgram = (path) => isProgram(path.parentPath);
-export const isParentBlock = (path) => isBlockStatement(path.parentPath);
+export const isInsideProgram = (path) => isProgram(path.parentPath);
+export const isInsideBlock = (path) => isBlockStatement(path.parentPath);
 
 export const isParentBlockLike = createTypeChecker('path.parentPath', [
     'Program',
@@ -59,7 +59,7 @@ export const isPrev = (path) => {
 };
 
 export const isNextParent = (path) => isNext(path.parentPath);
-export const isLast = (path) => isParentProgram(path) && !isNext(path);
+export const isLast = (path) => isInsideProgram(path) && !isNext(path);
 
 export const isNextObject = (a) => a
     .getNextSibling()
@@ -161,6 +161,7 @@ export const isForOf = (path) => {
 };
 
 export const isInsideIf = (path) => path.parentPath?.isIfStatement();
+export const isInsideExport = ({parentPath}) => parentPath.isExportDeclaration();
 
 export const isNewlineBetweenSiblings = (path) => {
     const endCurrent = path.node?.loc?.end?.line;

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

@@ -2,11 +2,11 @@ import {types} from '@putout/babel';
 import {createTypeChecker} from '#type-checker';
 import {
     isNext,
-    isParentProgram,
+    isInsideProgram,
     isLast,
     exists,
     satisfy,
-    isParentBlock,
+    isInsideBlock,
 } from '#is';
 import {insideIfWithNoBody} from './inside-if-with-no-body.js';
 
@@ -27,7 +27,7 @@ const isTopLevelWithNoNext = (path) => {
     if (isNext(path))
         return false;
     
-    return !isNext(path.parentPath) && isParentProgram(path.parentPath);
+    return !isNext(path.parentPath) && isInsideProgram(path.parentPath);
 };
 
 const isInsideDoWhile = ({parentPath}) => isDoWhileStatement(parentPath);
@@ -55,7 +55,7 @@ const isNoNewline = satisfy([
 ]);
 
 export const shouldAddNewlineAfter = createTypeChecker([
-    ['+', isParentBlock],
+    ['+', isInsideBlock],
     ['-', isNoNewline],
     ['+', isInsideIfWithoutElseInsideFn],
     ['-', isEmptyBodyNoNext],

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

@@ -1,5 +1,5 @@
 import {
-    isParentBlock,
+    isInsideBlock,
     isNextParent,
     isInsideIf,
     isInsideLabel,
@@ -21,7 +21,7 @@ export const BreakStatement = {
         print(';');
     },
     afterSatisfy: () => [
-        isParentBlock,
+        isInsideBlock,
         isNextParent,
         isInsideCase,
         isInsideIf,

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

@@ -1,7 +1,7 @@
 import {
     isNext,
     isInsideIf,
-    isParentBlock,
+    isInsideBlock,
 } from '#is';
 
 export const DebuggerStatement = {
@@ -11,7 +11,7 @@ export const DebuggerStatement = {
     },
     afterSatisfy: () => [
         isNext,
-        isParentBlock,
+        isInsideBlock,
         isInsideIf,
     ],
     after(path, {print}) {

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

@@ -1,7 +1,7 @@
 import {types} from '@putout/babel';
 import {printAttributes} from '#import-attributes';
 import {
-    isParentBlock,
+    isInsideBlock,
     isNewlineBetweenSiblings,
     exists,
     isNext,
@@ -169,7 +169,7 @@ export const ExportNamedDeclaration = {
         if (isNewlineBetweenSiblings(path))
             return true;
         
-        return isParentBlock(path);
+        return isInsideBlock(path);
     },
     after(path, {print, indent}) {
         const next = path.getNextSibling();

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

@@ -2,7 +2,7 @@ import {types} from '@putout/babel';
 import {
     isNext,
     isLast,
-    isParentBlock,
+    isInsideBlock,
     isParentLast,
     isNewlineBetweenSiblings,
     satisfy,
@@ -42,7 +42,7 @@ const notInsideReturn = not(isInsideReturn);
 
 const satisfyAfter = satisfy([
     isNotLastOrParentLast,
-    isParentBlock,
+    isInsideBlock,
     isNext,
     isNextUp,
 ]);

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

@@ -1,5 +1,5 @@
 import {types} from '@putout/babel';
-import {isNext, isParentBlock} from '#is';
+import {isNext, isInsideBlock} from '#is';
 
 const {isBlockStatement} = types;
 
@@ -24,6 +24,6 @@ export const printTrailingCommentLine = (path, printer, semantics, {printComment
     
     printComment();
     
-    if (hasNext || isParentBlock(path))
+    if (hasNext || isInsideBlock(path))
         print.newline();
 };

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

@@ -2,7 +2,7 @@ import {types} from '@putout/babel';
 import {
     isNext,
     isNextTry,
-    isParentBlock,
+    isInsideBlock,
 } from '#is';
 
 const {isExpressionStatement} = types;
@@ -55,5 +55,5 @@ export const CatchClause = (path, {print, maybe}) => {
     }
     
     print(body);
-    maybe.print.newline(isParentBlock(parentPath));
+    maybe.print.newline(isInsideBlock(parentPath));
 };

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

@@ -8,26 +8,44 @@ import {
     exists,
     noTrailingComment,
     isParentBlockLike,
+    isInsideIf,
+    isInsideBlock,
+    isInsideExport,
 } from '#is';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
 import {isConcatenation} from '../../expressions/binary-expression/concatenate.js';
 import {parseLeadingComments} from '../../comment/comment.js';
 import {maybeDeclare} from '../../maybe/maybe-declare.js';
 
+const isLast = (path) => path.parentPath?.isProgram() && !isNext(path);
+
 const {isExportDeclaration} = types;
 
 const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
 const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
-const isParentIf = (path) => path.parentPath.isIfStatement();
 
-const isParentBlock = createTypeChecker('path.parentPath', [
+const isIsideParentLike = createTypeChecker('path.parentPath', [
     'Program',
     'BlockStatement',
     'ExportNamedDeclaration',
     'LabeledStatement',
 ]);
 
+const isNeedSemicolon = createTypeChecker([
+    isIsideParentLike,
+    isParentSwitchCase,
+    isParentTSModuleBlock,
+    isInsideIf,
+]);
+
+const isNeedNewline = createTypeChecker([
+    ['-: -> !', isIsideParentLike],
+    ['-: -> !', isNext],
+    ['+', noTrailingComment],
+    ['+', isNewlineBetweenSiblings],
+]);
+
 export const VariableDeclaration = {
     beforeIf: shouldAddNewlineBefore,
     before(path, {print}) {
@@ -78,9 +96,7 @@ export const VariableDeclaration = {
         }
         
         maybe.indent.dec(n);
-        
-        if (isParentBlock(path) || isParentSwitchCase(path) || isParentTSModuleBlock(path) || isParentIf(path))
-            write(';');
+        maybe.write(isNeedSemicolon(path), ';');
         
         let wasNewline = false;
         
@@ -91,7 +107,7 @@ export const VariableDeclaration = {
                 wasNewline = true;
         }
         
-        if (isParentBlock(path) && isNext(path) && (noTrailingComment(path) || isNewlineBetweenSiblings(path))) {
+        if (isNeedNewline(path)) {
             write.newline();
             wasNewline = true;
         }
@@ -107,41 +123,35 @@ export const VariableDeclaration = {
         isNextCoupleLines,
         notLastPrevVarNotNextVar,
         isNewlineBetweenSiblings,
-        notLastParentExport,
+        isInsideExport,
         isParentTSModuleBlock,
     ],
-    after(path, {maybe, store}) {
+    after(path, {maybe, store, print}) {
         const wasNewline = store();
         
-        if (isLast(path.parentPath) && !path.parentPath.isBlockStatement() || !isParentBlock(path) && !isParentTSModuleBlock(path))
-            return false;
+        if (skipAfter(path))
+            return;
         
-        maybe.print.linebreak(wasNewline);
-        maybe.print.newline(!wasNewline);
+        maybe.indent(wasNewline);
+        print.newline();
         maybe.markAfter(wasNewline, path);
     },
 };
 
-function noNextParentBlock(path) {
-    if (isNext(path))
-        return false;
-    
-    return path.parentPath.isBlockStatement();
-}
+const skipAfter = createTypeChecker([
+    ['-: parentPath -> !', isLast],
+    ['+: -> !', isInsideBlock],
+]);
 
-function notLastParentExport(path) {
-    if (isLast(path.parentPath))
-        return false;
-    
-    return path.parentPath.isExportDeclaration();
-}
+const noNextParentBlock = createTypeChecker([
+    ['-', isNext],
+    ['+', isInsideBlock],
+]);
 
-function notLastCoupleLines(path) {
-    if (isLast(path))
-        return false;
-    
-    return isCoupleLines(path);
-}
+const notLastCoupleLines = createTypeChecker([
+    ['-', isLast],
+    ['+', isCoupleLines],
+]);
 
 function notLastPrevVarNotNextVar(path) {
     const prev = path.getPrevSibling();
@@ -169,8 +179,6 @@ function isNextCoupleLines(path) {
     return isCoupleLines(next);
 }
 
-const isLast = (path) => path.parentPath?.isProgram() && !isNext(path);
-
 function shouldAddNewlineBefore(path) {
     if (isFirst(path))
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -70,7 +70,7 @@
     "@putout/eslint": "^6.0.0",
     "@putout/eslint-flat": "^4.0.0",
     "@putout/plugin-minify": "^11.2.1",
-    "@putout/plugin-printer": "^7.0.0",
+    "@putout/plugin-printer": "^8.0.0",
     "@putout/plugin-promises": "^19.0.0",
     "@putout/plugin-react-hook-form": "^6.0.0",
     "@putout/plugin-react-hooks": "^9.0.0",