Remove dependency renaming to enable WASM (#625)

This PR supercedes #621 and tries to remove dependency renaming to enable WASM, as discussed in #106

Author: alubbe

Cargo.toml

@@ -14,9 +14,9 @@ edition = "2018"
 name = "swc"
 
 [dependencies]
-atoms = { package = "swc_atoms", path ="./atoms" }
-common = { package = "swc_common", path ="./common" }
-ecmascript = { package = "swc_ecmascript", path ="./ecmascript" }
+swc_atoms = { path ="./atoms" }
+swc_common = { path ="./common" }
+swc_ecmascript = { path ="./ecmascript" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 failure = "0.1"
@@ -37,4 +37,4 @@ name = "usage"
 
 [profile.bench]
 codegen-units = 1
-#lto = true
+#lto = true

ecmascript/Cargo.toml

@@ -10,11 +10,11 @@ publish = false
 edition = "2018"
 
 [dependencies]
-ast = { package = "swc_ecma_ast", path ="./ast" }
-codegen = { package = "swc_ecma_codegen", path ="./codegen" }
-parser = { package = "swc_ecma_parser", path ="./parser", features = ["verify"] }
-preset_env = { package = "swc_ecma_preset_env", path ="preset_env" }
-utils = { package = "swc_ecma_utils", path ="./utils" }
-transforms = { package = "swc_ecma_transforms", path ="./transforms" }
+swc_ecma_ast = { path ="./ast" }
+swc_ecma_codegen = { path ="./codegen" }
+swc_ecma_parser = { path ="./parser", features = ["verify"] }
+swc_ecma_preset_env = { path ="preset_env" }
+swc_ecma_utils = { path ="./utils" }
+swc_ecma_transforms = { path ="./transforms" }
 
 [dev-dependencies]

ecmascript/parser/Cargo.toml

@@ -19,7 +19,7 @@ verify = ["fold"]
 swc_atoms = { version = "0.2", path ="../../atoms" }
 swc_common = { version = "0.5.0", path ="../../common" }
 swc_ecma_ast = { version = "0.16.0", path ="../ast" }
-swc_ecma_parser_macros = { package = "swc_ecma_parser_macros", version = "0.4", path ="./macros" }
+swc_ecma_parser_macros = { version = "0.4", path ="./macros" }
 enum_kind = { version = "0.2", path ="../../macros/enum_kind" }
 unicode-xid = "0.2"
 log = { version = "0.4", features = ["release_max_level_debug"] }
@@ -42,4 +42,4 @@ pretty_assertions = "0.6"
 name = "lexer"
 
 [[example]]
-name = "typescript"
+name = "typescript"

ecmascript/src/lib.rs

@@ -1,5 +1,5 @@
-pub use ast;
-pub use codegen;
-pub use parser;
-pub use preset_env;
-pub use transforms;
+pub use swc_ecma_ast as ast;
+pub use swc_ecma_codegen as codegen;
+pub use swc_ecma_parser as parser;
+pub use swc_ecma_preset_env as preset_env;
+pub use swc_ecma_transforms as transforms;

ecmascript/transforms/Cargo.toml

@@ -11,8 +11,8 @@ edition = "2018"
 [dependencies]
 swc_atoms = { version = "0.2.0", path ="../../atoms" }
 swc_common = { version = "0.5.0", path ="../../common" }
-ast = { package = "swc_ecma_ast", version = "0.16.0", path ="../ast" }
-utils = { package = "swc_ecma_utils", version = "0.3.0", path ="../utils" }
+swc_ecma_ast = { version = "0.16.0", path ="../ast" }
+swc_ecma_utils = { version = "0.3.0", path ="../utils" }
 swc_ecma_parser = { version = "0.18", path ="../parser", features = ["verify"] }
 dashmap = "3.2.2"
 either = "1.5"
@@ -36,4 +36,4 @@ testing = { version = "0.5", path ="../../testing" }
 swc_ecma_codegen = { version = "0.15.0", path ="../codegen" }
 tempfile = "3"
 pretty_assertions = "0.6"
-sourcemap = "4.1.1"
+sourcemap = "4.1.1"

ecmascript/transforms/benches/base.rs

@@ -4,8 +4,8 @@
 
 extern crate test;
 
-use ast::*;
 use swc_common::{FileName, Fold, FoldWith, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 use swc_ecma_parser::{lexer::Lexer, Parser, Session, SourceFileInput, Syntax};
 use swc_ecma_transforms::util::ExprFactory;
 use test::Bencher;

ecmascript/transforms/src/compat/es2015.rs

@@ -7,9 +7,9 @@ pub use self::{
     template_literal::TemplateLiteral, typeof_symbol::TypeOfSymbol,
 };
 use crate::pass::Pass;
-use ast::Expr;
 use serde::Deserialize;
 use swc_common::chain;
+use swc_ecma_ast::Expr;
 
 mod arrow;
 mod block_scoped_fn;

ecmascript/transforms/src/compat/es2015/arrow.rs

@@ -2,9 +2,9 @@ use crate::{
     pass::Pass,
     util::{contains_this_expr, ExprFactory},
 };
-use ast::*;
 use swc_common::{Fold, FoldWith, Spanned, Visit, VisitWith, DUMMY_SP};
-use utils::quote_ident;
+use swc_ecma_ast::*;
+use swc_ecma_utils::quote_ident;
 
 /// Compile ES2015 arrow functions to ES5
 ///

ecmascript/transforms/src/compat/es2015/block_scoped_fn.rs

@@ -1,6 +1,6 @@
 use crate::util::UsageFinder;
-use ast::*;
 use swc_common::{Fold, FoldWith, Spanned, DUMMY_SP};
+use swc_ecma_ast::*;
 
 #[derive(Clone, Copy)]
 pub struct BlockScopedFns;

ecmascript/transforms/src/compat/es2015/block_scoping.rs

@@ -1,9 +1,11 @@
 use crate::{pass::Pass, util::undefined};
-use ast::*;
 use smallvec::SmallVec;
 use std::mem::replace;
 use swc_common::{util::map::Map, Fold, FoldWith, Spanned, Visit, VisitWith, DUMMY_SP};
-use utils::{find_ids, ident::IdentLike, prepend, var::VarCollector, ExprFactory, Id, StmtLike};
+use swc_ecma_ast::*;
+use swc_ecma_utils::{
+    find_ids, ident::IdentLike, prepend, var::VarCollector, ExprFactory, Id, StmtLike,
+};
 
 ///
 ///

ecmascript/transforms/src/compat/es2015/classes.rs

@@ -11,10 +11,10 @@ use crate::util::{
     alias_if_required, default_constructor, prepend, prop_name_to_expr, ExprFactory, IsDirective,
     ModuleItemLike, StmtLike,
 };
-use ast::*;
 use fxhash::FxBuildHasher;
 use std::iter;
 use swc_common::{Fold, FoldWith, Mark, Spanned, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 #[macro_use]
 mod macros;

ecmascript/transforms/src/compat/es2015/classes/constructor.rs

@@ -1,10 +1,10 @@
 use super::get_prototype_of;
 use crate::util::ExprFactory;
-use ast::*;
 use std::iter;
 use swc_atoms::JsWord;
 use swc_common::{Fold, FoldWith, Mark, Visit, VisitWith, DUMMY_SP};
-use utils::quote_ident;
+use swc_ecma_ast::*;
+use swc_ecma_utils::quote_ident;
 
 pub(super) struct SuperCallFinder {
     mode: Option<SuperFoldingMode>,

ecmascript/transforms/src/compat/es2015/classes/prop_name.rs

@@ -1,7 +1,7 @@
-use ast::*;
 use ordered_float::OrderedFloat;
 use swc_atoms::JsWord;
 use swc_common::{Span, Spanned};
+use swc_ecma_ast::*;
 
 #[derive(Debug, PartialEq, Eq, Hash)]
 pub enum HashKey {

ecmascript/transforms/src/compat/es2015/classes/super_field.rs

@@ -1,10 +1,10 @@
 use super::get_prototype_of;
 use crate::util::{alias_ident_for, is_rest_arguments, ExprFactory};
-use ast::*;
 use std::iter;
 use swc_atoms::js_word;
 use swc_common::{Fold, FoldWith, Mark, Span, Spanned, DUMMY_SP};
-use utils::quote_ident;
+use swc_ecma_ast::*;
+use swc_ecma_utils::quote_ident;
 
 /// Process function body.
 ///

ecmascript/transforms/src/compat/es2015/computed_props.rs

@@ -2,8 +2,8 @@ use crate::{
     pass::Pass,
     util::{ExprFactory, StmtLike},
 };
-use ast::*;
 use swc_common::{Fold, FoldWith, Mark, Spanned, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-computed-properties`
 ///

ecmascript/transforms/src/compat/es2015/destructuring.rs

@@ -5,10 +5,10 @@ use crate::{
         ExprFactory, StmtLike,
     },
 };
-use ast::*;
 use serde::Deserialize;
 use std::iter;
 use swc_common::{Fold, FoldWith, Spanned, SyntaxContext, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-destructuring`
 ///

ecmascript/transforms/src/compat/es2015/duplicate_keys.rs

@@ -1,8 +1,8 @@
 use crate::pass::Pass;
-use ast::*;
 use hashbrown::HashSet;
 use swc_atoms::JsWord;
 use swc_common::{Fold, FoldWith, Spanned};
+use swc_ecma_ast::*;
 
 pub fn duplicate_keys() -> impl Pass {
     DuplicateKeys

ecmascript/transforms/src/compat/es2015/for_of.rs

@@ -2,10 +2,10 @@ use crate::{
     pass::Pass,
     util::{alias_if_required, prepend, ExprFactory, StmtLike},
 };
-use ast::*;
 use serde::Deserialize;
 use swc_atoms::js_word;
 use swc_common::{Fold, FoldWith, Mark, Spanned, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-for-of`
 ///

ecmascript/transforms/src/compat/es2015/function_name.rs

@@ -1,6 +1,6 @@
 use crate::{pass::Pass, util::UsageFinder};
-use ast::*;
 use swc_common::{Fold, FoldWith};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-function-name`
 ///

ecmascript/transforms/src/compat/es2015/instanceof.rs

@@ -1,6 +1,6 @@
 use crate::util::ExprFactory;
-use ast::*;
 use swc_common::{Fold, FoldWith, Visit, VisitWith};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-instanceof`
 ///

ecmascript/transforms/src/compat/es2015/parameters.rs

@@ -1,7 +1,7 @@
 use crate::util::{prepend_stmts, ExprFactory};
 use arrayvec::ArrayVec;
-use ast::*;
 use swc_common::{Fold, FoldWith, Mark, Spanned, DUMMY_SP};
+use swc_ecma_ast::*;
 
 pub fn parameters() -> Params {
     Params

ecmascript/transforms/src/compat/es2015/regenerator/case.rs

@@ -3,14 +3,14 @@ use crate::{
     compat::es2015::regenerator::leap::{CatchEntry, FinallyEntry, TryEntry},
     util::{ident::IdentLike, undefined, ExprFactory},
 };
-use ast::*;
 use smallvec::SmallVec;
 use std::mem::replace;
 use swc_atoms::JsWord;
 use swc_common::{
     util::{map::Map, move_map::MoveMap},
     BytePos, Fold, FoldWith, Span, Spanned, SyntaxContext, Visit, VisitWith, DUMMY_SP,
 };
+use swc_ecma_ast::*;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub(super) struct Loc {

ecmascript/transforms/src/compat/es2015/regenerator/hoist.rs

@@ -1,8 +1,8 @@
 use crate::util::find_ids;
-use ast::*;
 use smallvec::SmallVec;
 use swc_atoms::js_word;
 use swc_common::{Fold, FoldWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 pub(super) type Vars = SmallVec<[Ident; 32]>;
 

ecmascript/transforms/src/compat/es2015/regenerator/mod.rs

@@ -3,10 +3,10 @@ use crate::{
     pass::Pass,
     util::{contains_this_expr, prepend, ExprFactory, StmtLike},
 };
-use ast::*;
 use std::mem::replace;
 use swc_atoms::js_word;
 use swc_common::{Fold, FoldWith, Spanned, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 mod case;
 mod hoist;

ecmascript/transforms/src/compat/es2015/shorthand_property.rs

@@ -1,5 +1,5 @@
-use ast::*;
 use swc_common::{Fold, FoldWith};
+use swc_ecma_ast::*;
 
 /// Compile ES2015 shorthand properties to ES5
 ///

ecmascript/transforms/src/compat/es2015/spread.rs

@@ -2,11 +2,11 @@ use crate::{
     pass::Pass,
     util::{alias_ident_for, is_literal, prepend, undefined, ExprFactory, StmtLike},
 };
-use ast::*;
 use serde::Deserialize;
 use std::mem;
 use swc_atoms::js_word;
 use swc_common::{util::move_map::MoveMap, Fold, FoldWith, Span, Spanned, DUMMY_SP};
+use swc_ecma_ast::*;
 
 pub fn spread(c: Config) -> impl Pass {
     Spread { c }

ecmascript/transforms/src/compat/es2015/sticky_regex.rs

@@ -1,7 +1,7 @@
 use crate::util::ExprFactory;
-use ast::*;
 use swc_atoms::JsWord;
 use swc_common::{Fold, FoldWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 /// Compile ES2015 sticky regex to an ES5 RegExp constructor
 ///

ecmascript/transforms/src/compat/es2015/template_literal.rs

@@ -1,8 +1,8 @@
 use crate::util::{is_literal, prepend_stmts, ExprFactory, StmtLike};
-use ast::*;
 use std::{iter, mem};
 use swc_atoms::js_word;
 use swc_common::{BytePos, Fold, FoldWith, Spanned, DUMMY_SP};
+use swc_ecma_ast::*;
 
 #[derive(Default, Clone)]
 pub struct TemplateLiteral {

ecmascript/transforms/src/compat/es2015/typeof_symbol.rs

@@ -1,7 +1,7 @@
 use crate::util::ExprFactory;
-use ast::*;
 use swc_atoms::js_word;
 use swc_common::{Fold, FoldWith, Visit, VisitWith};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-typeof-symbol`
 ///

ecmascript/transforms/src/compat/es2016/exponentation.rs

@@ -2,8 +2,8 @@ use crate::{
     pass::Pass,
     util::{ExprFactory, StmtLike},
 };
-use ast::*;
 use swc_common::{Fold, FoldWith, Span, Spanned, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-exponentiation-operator`
 ///

ecmascript/transforms/src/compat/es2017/async_to_generator.rs

@@ -3,9 +3,9 @@ use crate::{
     pass::Pass,
     util::{contains_ident_ref, contains_this_expr, ExprFactory, StmtLike},
 };
-use ast::*;
 use std::iter;
 use swc_common::{Fold, FoldWith, Mark, Spanned, Visit, VisitWith, DUMMY_SP};
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-transform-async-to-generator`
 ///

ecmascript/transforms/src/compat/es2018/object_rest_spread.rs

@@ -4,11 +4,11 @@ use crate::{
         alias_ident_for, alias_if_required, is_literal, var::VarCollector, ExprFactory, StmtLike,
     },
 };
-use ast::*;
 use std::{iter, mem};
 use swc_common::{
     chain, util::move_map::MoveMap, Fold, FoldWith, Mark, Spanned, Visit, VisitWith, DUMMY_SP,
 };
+use swc_ecma_ast::*;
 
 /// `@babel/plugin-proposal-object-rest-spread`
 pub fn object_rest_spread() -> impl Pass {

ecmascript/transforms/src/compat/es2018/optional_catch_binding.rs

@@ -1,6 +1,6 @@
 use crate::pass::Pass;
-use ast::*;
 use swc_common::Fold;
+use swc_ecma_ast::*;
 
 struct OptionalCatchBinding;
 

ecmascript/transforms/src/compat/es3.rs

@@ -2,7 +2,7 @@ pub use self::{
     member_expr_lits::MemberExprLit, prop_lits::PropertyLiteral, reserved_word::ReservedWord,
 };
 use crate::pass::Pass;
-use ast::Expr;
+use swc_ecma_ast::Expr;
 
 mod member_expr_lits;
 mod prop_lits;

ecmascript/transforms/src/compat/es3/member_expr_lits.rs

@@ -1,6 +1,6 @@
 use crate::util::is_valid_ident;
-use ast::*;
 use swc_common::{Fold, FoldWith};
+use swc_ecma_ast::*;
 
 /// babel: `transform-member-expression-literals`
 ///