feature: @putout/printer: VariableDeclaration: beforeIf: move out

Author: coderaiser

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)],
+]);

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];
-}