feature: @putout/printer: ImportDeclaration: comments before ExpressionStatement

Author: coderaiser

lib/tokenize/comment/comments-printer/comments-printer.js

@@ -21,13 +21,27 @@ module.exports.printLeadingComments = (path, printer, semantics, {currentTravers
         leadingComments = [],
     } = path.node;
 
-    const {printLeadingCommentLine} = currentTraverse;
+    const {
+        printLeadingCommentLine,
+        printLeadingCommentBlock,
+    } = currentTraverse;
+    
+    const n = leadingComments.length - 1;
 
     for (const [index, {type, value}] of leadingComments.entries()) {
-        if (type === 'CommentLine')
+        if (type === 'CommentLine') {
             printLeadingCommentLine?.(path, printer, semantics, {
                 index,
                 printComment: createPrintCommentLine(print, value),
+                isLast: index === n,
+            });
+            continue;
+        }
+        
+        if (type === 'CommentBlock')
+            printLeadingCommentBlock?.(path, printer, semantics, {
+                index,
+                printComment: createPrintCommentBlock(print, value),
             });
     }
 };
@@ -38,9 +52,23 @@ module.exports.printTrailingComments = (path, printer, semantics, {currentTraver
         trailingComments = [],
     } = path.node;
 
-    const {printTrailingCommentBlock} = currentTraverse;
+    const {
+        printTrailingCommentLine,
+        printTrailingCommentBlock,
+    } = currentTraverse;
+    
+    const n = trailingComments.length - 1;
 
     for (const [index, {type, value}] of trailingComments.entries()) {
+        if (type === 'CommentLine') {
+            printTrailingCommentLine?.(path, printer, semantics, {
+                index,
+                printComment: createPrintCommentLine(print, value),
+                isLast: index === n,
+            });
+            continue;
+        }
+        
         if (type === 'CommentBlock')
             printTrailingCommentBlock?.(path, printer, semantics, {
                 index,

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

@@ -0,0 +1,44 @@
+'use strict';
+
+const {types} = require('@putout/babel');
+const {hasTrailingComment} = require('#is');
+
+const {
+    isBlockStatement,
+    isProgram,
+    isIfStatement,
+    isClassMethod,
+} = types;
+
+module.exports.printLeadingCommentLine = (path, printer, semantics, {index, isLast, printComment}) => {
+    const {print, indent} = printer;
+    const prev = path.getPrevSibling();
+    const {parentPath} = path;
+    const parentParentPath = parentPath.parentPath;
+    
+    if (hasTrailingComment(prev))
+        return;
+    
+    if (!index && !prev.node && (isIfStatement(parentPath) || isClassMethod(parentParentPath)))
+        indent();
+    
+    printComment();
+    
+    print.newline();
+    
+    if (!isLast && !path.parentPath.isIfStatement())
+        print.indent();
+};
+
+module.exports.printLeadingCommentBlock = (path, printer, semantics, {printComment}) => {
+    const {indent} = printer;
+    const prev = path.getPrevSibling();
+    
+    if (hasTrailingComment(prev))
+        return;
+    
+    if (isBlockStatement(path.parentPath) && !isProgram(path.parentPath.parentPath))
+        indent();
+    
+    printComment();
+};

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

@@ -15,6 +15,12 @@ const {
 } = require('../../is');
 
 const {isInsideAssignNextAssignFunction} = require('./is-inside-assign-next-assign-function');
+
+const {
+    printLeadingCommentLine,
+    printLeadingCommentBlock,
+} = require('./comments');
+
 const isCommentBlock = (a) => a?.type === 'CommentBlock';
 
 const {
@@ -117,6 +123,8 @@ module.exports.ExpressionStatement = {
         }
     },
 };
+module.exports.ExpressionStatement.printLeadingCommentLine = printLeadingCommentLine;
+module.exports.ExpressionStatement.printLeadingCommentBlock = printLeadingCommentBlock;
 
 function isTopParentLast({parentPath}) {
     if (!parentPath.isIfStatement())

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

@@ -56,6 +56,11 @@ test('printer: tokenizer: statement: expression: after call: indent', (t) => {
     t.end();
 });
 
+test('printer: tokenizer: statement: expression: leading comment', (t) => {
+    t.print(fixture.expressionLeadingComment);
+    t.end();
+});
+
 test('printer: tokenizer: statement: expression: before if', (t) => {
     const source = fixture.expressionBeforeIf;
     const ast = parse(source);

lib/tokenize/statements/expression-statement/fixture/expression-leading-comment.js

@@ -0,0 +1,4 @@
+import currify from 'currify';
+
+// hello
+transpile('');

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

@@ -0,0 +1,18 @@
+'use strict';
+
+const {types} = require('@putout/babel');
+const {isExportDeclaration} = types;
+
+module.exports.printTrailingCommentLine = (path, printer, semantics, {printComment}) => {
+    const {print} = printer;
+    printComment();
+    print.breakline();
+};
+
+module.exports.printTrailingCommentBlock = (path, printer, semantics, {printComment}) => {
+    const {maybe} = printer;
+    const next = path.getNextSibling();
+    
+    maybe.print.breakline(!isExportDeclaration(next));
+    printComment();
+};

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

@@ -1,7 +1,7 @@
 'use strict';
 
 const {parseImportSpecifiers} = require('parse-import-specifiers');
-const {types} = require('@putout/babel');
+
 const {markAfter} = require('../../mark');
 const {isLast, isNext} = require('../../is');
 
@@ -10,7 +10,10 @@ const {
     ImportAttribute,
 } = require('./import-attribute');
 
-const {isExportDeclaration} = types;
+const {
+    printTrailingCommentBlock,
+    printTrailingCommentLine,
+} = require('./comments');
 
 module.exports.ImportAttribute = ImportAttribute;
 module.exports.ImportDeclaration = {
@@ -137,10 +140,5 @@ function parseMaxSpecifiers(imports, semantics) {
     return maxSpecifiersInOneLine;
 }
 
-module.exports.ImportDeclaration.printTrailingCommentBlock = (path, printer, semantics, {printComment}) => {
-    const {maybe} = printer;
-    const next = path.getNextSibling();
-    
-    maybe.print.breakline(!isExportDeclaration(next));
-    printComment();
-};
+module.exports.ImportDeclaration.printTrailingCommentBlock = printTrailingCommentBlock;
+module.exports.ImportDeclaration.printTrailingCommentLine = printTrailingCommentLine;