feat(formatter): complete printing ImportDeclaration

crates/oxc_formatter/src/formatter/comments/mod.rs

@@ -345,6 +345,12 @@ impl<'a> Comments<'a> {
         );
 
         let Some(following_node) = following_node else {
+            if let SiblingNode::ImportDeclaration(import) = enclosing_node
+                && import.source.span.start > preceding_span.end
+            {
+                return self.comments_before(import.source.span.start);
+            }
+
             let enclosing_span = enclosing_node.span();
             return self.comments_before(enclosing_span.end);
         };
@@ -427,6 +433,13 @@ impl<'a> Comments<'a> {
             return &[];
         }
 
+        if matches!(
+            enclosing_node,
+            SiblingNode::ImportDeclaration(_) | SiblingNode::ExportAllDeclaration(_)
+        ) {
+            return &comments[..comment_index];
+        }
+
         let mut gap_end = following_span.start;
         for cur_index in (0..comment_index).rev() {
             let comment = &comments[cur_index];

crates/oxc_formatter/src/write/import_declaration.rs

@@ -0,0 +1,211 @@
+use oxc_allocator::Vec;
+use oxc_ast::ast::*;
+use oxc_span::GetSpan;
+use oxc_syntax::identifier::is_identifier_name;
+
+use crate::{
+    Format, FormatResult, FormatTrailingCommas, QuoteProperties, TrailingSeparator,
+    formatter::{
+        Formatter, prelude::*, separated::FormatSeparatedIter, trivia::FormatLeadingComments,
+    },
+    generated::ast_nodes::{AstNode, AstNodes},
+    write,
+    write::semicolon::OptionalSemicolon,
+};
+
+use super::FormatWrite;
+
+impl<'a> FormatWrite<'a> for AstNode<'a, ImportExpression<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        write!(f, ["import"])?;
+        if let Some(phase) = &self.phase() {
+            write!(f, [".", phase.as_str()])?;
+        }
+        write!(f, ["(", self.source()])?;
+        if let Some(options) = &self.options() {
+            write!(f, [",", space(), options])?;
+        }
+        write!(f, ")")
+    }
+}
+
+impl<'a> Format<'a> for ImportOrExportKind {
+    fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        if self.is_type() { write!(f, ["type", space()]) } else { Ok(()) }
+    }
+}
+
+impl<'a> FormatWrite<'a> for AstNode<'a, ImportDeclaration<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        write!(f, ["import", space(), self.import_kind])?;
+
+        if let Some(specifiers) = self.specifiers() {
+            write!(f, [specifiers, space(), "from", space()])?;
+        }
+
+        write!(f, [self.source(), self.with_clause(), OptionalSemicolon])
+    }
+}
+
+impl<'a> Format<'a> for AstNode<'a, Vec<'a, ImportDeclarationSpecifier<'a>>> {
+    fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        let mut specifiers_iter = self.iter().peekable();
+
+        while let Some(specifier) = specifiers_iter.peek() {
+            match specifier.as_ref() {
+                ImportDeclarationSpecifier::ImportDefaultSpecifier(_) => {
+                    write!(f, [specifiers_iter.next().unwrap()])?;
+                }
+                ImportDeclarationSpecifier::ImportNamespaceSpecifier(_) => {
+                    write!(f, [specifiers_iter.next().unwrap()])?;
+                }
+                ImportDeclarationSpecifier::ImportSpecifier(_) => {
+                    break;
+                }
+            }
+
+            if specifiers_iter.peek().is_some() {
+                write!(f, [",", space()])?;
+            } else {
+                return Ok(());
+            }
+        }
+
+        let should_insert_space_around_brackets = f.options().bracket_spacing.value();
+
+        if self.is_empty() {
+            write!(f, ["{", "}"])?;
+        } else if self.len() == 1
+            && let Some(ImportDeclarationSpecifier::ImportSpecifier(specifier)) =
+                specifiers_iter.peek().map(AsRef::as_ref)
+            && !f.comments().has_comments_before(specifier.local.span.start)
+        {
+            write!(
+                f,
+                [
+                    "{",
+                    maybe_space(should_insert_space_around_brackets),
+                    specifiers_iter.next().unwrap(),
+                    maybe_space(should_insert_space_around_brackets),
+                    "}",
+                ]
+            )?;
+        } else {
+            write!(
+                f,
+                [
+                    "{",
+                    group(&soft_block_indent_with_maybe_space(
+                        &format_once(|f| {
+                            let trailing_separator =
+                                FormatTrailingCommas::ES5.trailing_separator(f.options());
+
+                            f.join_with(&soft_line_break_or_space())
+                                .entries(
+                                    FormatSeparatedIter::new(specifiers_iter, ",")
+                                        .with_trailing_separator(trailing_separator),
+                                )
+                                .finish()
+                        }),
+                        should_insert_space_around_brackets
+                    )),
+                    "}"
+                ]
+            )?;
+        }
+
+        Ok(())
+    }
+}
+
+impl<'a> FormatWrite<'a> for AstNode<'a, ImportSpecifier<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        let comments = f.context().comments().comments_before(self.local.span.end);
+        let mut len = comments.len();
+        while len != 0 && comments[len - 1].is_block() {
+            len -= 1;
+        }
+        write!(f, [FormatLeadingComments::Comments(&comments[..len]), self.import_kind()])?;
+        if self.local.span == self.imported.span() {
+            write!(f, [self.local()])?;
+        } else {
+            write!(f, [self.imported(), space(), "as", space(), self.local()])?;
+        }
+        Ok(())
+    }
+}
+
+impl<'a> FormatWrite<'a> for AstNode<'a, ImportDefaultSpecifier<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        self.local().fmt(f)
+    }
+}
+
+impl<'a> FormatWrite<'a> for AstNode<'a, ImportNamespaceSpecifier<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        write!(f, ["*", space(), "as", space(), self.local()])
+    }
+}
+
+impl<'a> FormatWrite<'a> for AstNode<'a, WithClause<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        let should_insert_space_around_brackets = f.options().bracket_spacing.value();
+        let format_comment = format_with(|f| {
+            if self.with_entries().is_empty() {
+                let comments = f.context().comments().comments_before(self.span.end);
+                write!(f, [space(), FormatLeadingComments::Comments(comments)])?;
+            }
+            Ok(())
+        });
+        write!(
+            f,
+            [
+                space(),
+                format_comment,
+                match self.keyword() {
+                    WithClauseKeyword::With => "with",
+                    WithClauseKeyword::Assert => "assert",
+                },
+                space(),
+                self.with_entries(),
+            ]
+        )
+    }
+}
+
+impl<'a> Format<'a> for AstNode<'a, Vec<'a, ImportAttribute<'a>>> {
+    fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        write!(f, "{")?;
+        if !self.is_empty() {
+            let maybe_space = maybe_space(f.options().bracket_spacing.value());
+            write!(f, [maybe_space])?;
+
+            f.join_with(space())
+                .entries(
+                    FormatSeparatedIter::new(self.iter(), ",")
+                        .with_trailing_separator(TrailingSeparator::Disallowed),
+                )
+                .finish()?;
+
+            write!(f, [maybe_space])?;
+        }
+        write!(f, "}")
+    }
+}
+
+impl<'a> FormatWrite<'a> for AstNode<'a, ImportAttribute<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        if let AstNodes::StringLiteral(s) = self.key().as_ast_nodes() {
+            if f.options().quote_properties == QuoteProperties::AsNeeded
+                && is_identifier_name(s.value().as_str())
+            {
+                dynamic_text(s.value().as_str()).fmt(f)?;
+            } else {
+                s.fmt(f)?;
+            }
+        } else {
+            write!(f, self.key())?;
+        }
+        write!(f, [":", space(), self.value()])
+    }
+}