use swc_ecmascript crate, remove reexports

Author: bartlomieju

Cargo.lock

@@ -23,8 +23,7 @@ panic = "abort"
 [dependencies]
 dprint-core = "0.24.1"
 swc_common = "=0.8.0"
-swc_ecma_ast = "=0.27.0"
-swc_ecma_parser = "=0.32.0"
+swc_ecmascript = { version = "=0.1.0", features = ["parser"] }
 serde = { version = "1.0.88", features = ["derive"] }
 serde_json = "1.0"
 

Cargo.toml

@@ -12,11 +12,3 @@ pub use formatter::Formatter;
 
 #[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
 pub use wasm_plugin::*;
-
-// Re-export swc for use in Deno
-#[doc(hidden)]
-pub use swc_common;
-#[doc(hidden)]
-pub use swc_ecma_ast;
-#[doc(hidden)]
-pub use swc_ecma_parser;

src/lib.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use super::*;
 use swc_common::{BytePos, comments::{Comment}};
-use swc_ecma_parser::{token::{Token, TokenAndSpan}};
+use swc_ecmascript::parser::{token::{Token, TokenAndSpan}};
 
 pub struct CommentCollection<'a> {
     leading: &'a HashMap<BytePos, Vec<Comment>>,

src/parsing/comments.rs

@@ -1,9 +1,9 @@
 use std::rc::Rc;
 use dprint_core::*;
 use dprint_core::{parser_helpers::*,condition_resolvers, conditions::*};
-use swc_ecma_ast::*;
+use swc_ecmascript::ast::*;
 use swc_common::{comments::{Comment, CommentKind}, BytePos, Span, Spanned};
-use swc_ecma_parser::{token::{TokenAndSpan}};
+use swc_ecmascript::parser::{token::{TokenAndSpan}};
 
 use super::*;
 use super::swc::*;
@@ -6115,7 +6115,7 @@ fn parse_jsx_children<'a>(opts: ParseJsxChildrenOptions<'a>, context: &mut Conte
 
     fn should_use_space(child: &Node, context: &mut Context) -> bool {
         let past_token = context.token_finder.get_previous_token(child);
-        if let Some(TokenAndSpan { token: swc_ecma_parser::token::Token::JSXText { .. }, span, had_line_break }) = past_token {
+        if let Some(TokenAndSpan { token: swc_ecmascript::parser::token::Token::JSXText { .. }, span, had_line_break }) = past_token {
             let text = span.text(context);
             if !had_line_break && text.ends_with(" ") {
                 return true;

src/parsing/parser.rs

@@ -2,8 +2,8 @@ use std::str;
 use std::collections::{HashSet, HashMap};
 use dprint_core::{Info, ConditionReference};
 use swc_common::{BytePos, comments::{Comment, CommentKind}, SourceFile, Spanned, Span};
-use swc_ecma_ast::*;
-use swc_ecma_parser::{token::TokenAndSpan};
+use swc_ecmascript::ast::*;
+use swc_ecmascript::parser::{token::TokenAndSpan};
 use super::*;
 use super::super::configuration::*;
 use super::super::utils::Stack;

src/parsing/parser_types.rs

@@ -1,4 +1,4 @@
-use swc_ecma_ast::BinaryOp;
+use swc_ecmascript::ast::BinaryOp;
 
 pub trait BinaryOpExtensions {
     fn is_add_sub(&self) -> bool;

src/parsing/swc/extensions.rs

@@ -1,5 +1,5 @@
-use swc_ecma_ast::*;
-use swc_ecma_parser::{token::{TokenAndSpan}};
+use swc_ecmascript::ast::*;
+use swc_ecmascript::parser::{token::{TokenAndSpan}};
 
 use super::*;
 use super::super::*;

src/parsing/swc/flatten_binary_expr.rs

@@ -1,7 +1,7 @@
 use std::str;
 use super::*;
 use swc_common::{BytePos, Span};
-use swc_ecma_parser::{token::{Token, TokenAndSpan}};
+use swc_ecmascript::parser::{token::{Token, TokenAndSpan}};
 use dprint_core::tokens::{TokenFinder as CoreTokenFinder, TokenCollection};
 
 pub struct TokenFinder<'a> {

src/parsing/tokens.rs

@@ -5,8 +5,8 @@ use swc_common::{
     errors::{Handler, Emitter, DiagnosticBuilder},
     FileName, comments::{Comment, SingleThreadedComments, SingleThreadedCommentsMap}, SourceFile, BytePos
 };
-use swc_ecma_ast::{Module};
-use swc_ecma_parser::{Parser, StringInput, Syntax, lexer::Lexer, Capturing, JscTarget, token::{TokenAndSpan}};
+use swc_ecmascript::ast::{Module};
+use swc_ecmascript::parser::{Parser, StringInput, Syntax, lexer::Lexer, Capturing, JscTarget, token::{TokenAndSpan}};
 
 pub struct ParsedSourceFile<'a> {
     pub module: Module,
@@ -49,7 +49,7 @@ fn parse_inner<'a>(file_path: &PathBuf, file_text: &'a str) -> Result<ParsedSour
 
     let comments: SingleThreadedComments = Default::default();
     let (module, tokens) = {
-        let mut ts_config: swc_ecma_parser::TsConfig = Default::default();
+        let mut ts_config: swc_ecmascript::parser::TsConfig = Default::default();
         ts_config.tsx = should_parse_as_jsx(file_path);
         ts_config.dynamic_import = true;
         ts_config.decorators = true;