diff --git a/packages/transformers/js/core/src/hoist_collect.rs b/packages/transformers/js/core/src/collect.rs similarity index 99% rename from packages/transformers/js/core/src/hoist_collect.rs rename to packages/transformers/js/core/src/collect.rs index d1524510b32..2fc63dcd36f 100644 --- a/packages/transformers/js/core/src/hoist_collect.rs +++ b/packages/transformers/js/core/src/collect.rs @@ -32,7 +32,7 @@ pub struct Export { pub loc: SourceLocation, } -pub struct HoistCollect { +pub struct Collect { pub source_map: Lrc, pub decls: HashSet, pub ignore_mark: Mark, @@ -84,13 +84,13 @@ struct ExportedAll { } #[derive(Serialize, Debug)] -pub struct HoistCollectResult { +pub struct CollectResult { imports: Vec, exports: Vec, exports_all: Vec, } -impl HoistCollect { +impl Collect { pub fn new( source_map: Lrc, decls: HashSet, @@ -98,7 +98,7 @@ impl HoistCollect { global_mark: Mark, trace_bailouts: bool, ) -> Self { - HoistCollect { + Collect { source_map, decls, ignore_mark, @@ -125,9 +125,9 @@ impl HoistCollect { } } -impl From for HoistCollectResult { - fn from(collect: HoistCollect) -> HoistCollectResult { - HoistCollectResult { +impl From for CollectResult { + fn from(collect: Collect) -> CollectResult { + CollectResult { imports: collect .imports .into_iter() @@ -191,7 +191,7 @@ macro_rules! collect_visit_fn { }; } -impl Visit for HoistCollect { +impl Visit for Collect { fn visit_module(&mut self, node: &Module, _parent: &dyn Node) { self.in_module_this = true; self.in_top_level = true; @@ -822,7 +822,7 @@ impl Visit for HoistCollect { } } -impl HoistCollect { +impl Collect { pub fn match_require(&self, node: &Expr) -> Option { match_require(node, &self.decls, self.ignore_mark) } diff --git a/packages/transformers/js/core/src/fs.rs b/packages/transformers/js/core/src/fs.rs index b92b8442c21..359d59c09fe 100644 --- a/packages/transformers/js/core/src/fs.rs +++ b/packages/transformers/js/core/src/fs.rs @@ -1,5 +1,5 @@ +use crate::collect::{Collect, Import}; use crate::dependency_collector::{DependencyDescriptor, DependencyKind}; -use crate::hoist_collect::{HoistCollect, Import}; use crate::utils::SourceLocation; use data_encoding::{BASE64, HEXLOWER}; use std::collections::HashSet; @@ -26,7 +26,7 @@ pub fn inline_fs<'a>( ) -> impl Fold + 'a { InlineFS { filename: Path::new(filename).to_path_buf(), - collect: HoistCollect::new( + collect: Collect::new( source_map, decls, Mark::fresh(Mark::root()), @@ -41,7 +41,7 @@ pub fn inline_fs<'a>( struct InlineFS<'a> { filename: PathBuf, - collect: HoistCollect, + collect: Collect, global_mark: Mark, project_root: &'a str, deps: &'a mut Vec, diff --git a/packages/transformers/js/core/src/hoist.rs b/packages/transformers/js/core/src/hoist.rs index 93484e86ecc..770831c4bf6 100644 --- a/packages/transformers/js/core/src/hoist.rs +++ b/packages/transformers/js/core/src/hoist.rs @@ -7,7 +7,7 @@ use swc_common::{sync::Lrc, Mark, Span, SyntaxContext, DUMMY_SP}; use swc_ecmascript::ast::*; use swc_ecmascript::visit::{Fold, FoldWith, VisitWith}; -use crate::hoist_collect::{HoistCollect, Import, ImportKind}; +use crate::collect::{Collect, Import, ImportKind}; use crate::id; use crate::utils::{ match_import, match_member_expr, match_require, CodeHighlight, Diagnostic, DiagnosticSeverity, @@ -31,7 +31,7 @@ pub fn hoist( global_mark: Mark, trace_bailouts: bool, ) -> Result<(Module, HoistResult, Vec), Vec> { - let mut collect = HoistCollect::new(source_map, decls, ignore_mark, global_mark, trace_bailouts); + let mut collect = Collect::new(source_map, decls, ignore_mark, global_mark, trace_bailouts); module.visit_with(&Invalid { span: DUMMY_SP } as _, &mut collect); let mut hoist = Hoist::new(module_id, &collect); @@ -67,7 +67,7 @@ struct ImportedSymbol { struct Hoist<'a> { module_id: &'a str, - collect: &'a HoistCollect, + collect: &'a Collect, module_items: Vec, export_decls: HashSet, hoisted_imports: Vec, @@ -95,7 +95,7 @@ pub struct HoistResult { } impl<'a> Hoist<'a> { - fn new(module_id: &'a str, collect: &'a HoistCollect) -> Self { + fn new(module_id: &'a str, collect: &'a Collect) -> Self { Hoist { module_id, collect, @@ -1124,7 +1124,7 @@ mod tests { extern crate indoc; use self::indoc::indoc; - fn parse(code: &str) -> (HoistCollect, String, HoistResult) { + fn parse(code: &str) -> (Collect, String, HoistResult) { let source_map = Lrc::new(SourceMap::default()); let source_file = source_map.new_source_file(FileName::Anon, code.into()); @@ -1148,7 +1148,7 @@ mod tests { let global_mark = Mark::fresh(Mark::root()); let module = module.fold_with(&mut resolver_with_mark(global_mark)); - let mut collect = HoistCollect::new( + let mut collect = Collect::new( source_map.clone(), collect_decls(&module), Mark::fresh(Mark::root()), diff --git a/packages/transformers/js/core/src/lib.rs b/packages/transformers/js/core/src/lib.rs index 0410325cce2..01e3b587a6d 100644 --- a/packages/transformers/js/core/src/lib.rs +++ b/packages/transformers/js/core/src/lib.rs @@ -12,13 +12,13 @@ extern crate serde; extern crate serde_bytes; extern crate sha1; +mod collect; mod decl_collector; mod dependency_collector; mod env_replacer; mod fs; mod global_replacer; mod hoist; -mod hoist_collect; mod modules; mod utils; @@ -45,13 +45,13 @@ use swc_ecmascript::transforms::{ }; use swc_ecmascript::visit::{FoldWith, VisitWith}; +use collect::{Collect, CollectResult}; use decl_collector::*; use dependency_collector::*; use env_replacer::*; use fs::inline_fs; use global_replacer::GlobalReplacer; use hoist::{hoist, HoistResult}; -use hoist_collect::{HoistCollect, HoistCollectResult}; use modules::esm2cjs; use utils::{CodeHighlight, Diagnostic, DiagnosticSeverity, SourceLocation, SourceType}; @@ -97,7 +97,7 @@ pub struct TransformResult { shebang: Option, dependencies: Vec, hoist_result: Option, - symbol_result: Option, + symbol_result: Option, diagnostics: Option>, needs_esm_helpers: bool, used_env: HashSet, @@ -418,7 +418,7 @@ pub fn transform(config: Config) -> Result { } } } else { - let mut symbols_collect = HoistCollect::new( + let mut symbols_collect = Collect::new( source_map.clone(), decls, Mark::fresh(Mark::root()),