Implement module transforms

atoms/words.txt

@@ -585,6 +585,7 @@ debugger
 declare
 default
 delete
+displayName
 do
 else
 enum
@@ -634,6 +635,7 @@ switch
 symbol
 target
 this
+this
 throw
 true
 try

common/src/syntax_pos/hygiene.rs

@@ -522,3 +522,9 @@ pub struct ExpnInfo {
     /// resolution.
     pub def_site: Option<Span>,
 }
+
+impl Default for Mark {
+    fn default() -> Self {
+        Mark::root()
+    }
+}

ecmascript/ast/src/expr.rs

@@ -3,7 +3,7 @@ use crate::{
     function::Function,
     ident::{Ident, PrivateName},
     jsx::{JSXElement, JSXEmptyExpr, JSXFragment, JSXMemberExpr, JSXNamespacedName},
-    lit::{Lit, Str},
+    lit::{Bool, Lit, Number, Str},
     operators::{AssignOp, BinaryOp, UnaryOp, UpdateOp},
     pat::Pat,
     prop::Prop,
@@ -15,7 +15,7 @@ use crate::{
 };
 #[cfg(feature = "fold")]
 use swc_common::Fold;
-use swc_common::{ast_node, Span, Spanned};
+use swc_common::{ast_node, Span, Spanned, DUMMY_SP};
 
 #[ast_node]
 pub enum Expr {
@@ -315,3 +315,39 @@ pub enum PatOrExpr {
     Pat(Box<Pat>),
     Expr(Box<Expr>),
 }
+
+impl From<bool> for Expr {
+    fn from(value: bool) -> Self {
+        Expr::Lit(Lit::Bool(Bool {
+            span: DUMMY_SP,
+            value,
+        }))
+    }
+}
+
+impl From<f64> for Expr {
+    fn from(value: f64) -> Self {
+        Expr::Lit(Lit::Num(Number {
+            span: DUMMY_SP,
+            value,
+        }))
+    }
+}
+
+impl From<Bool> for Expr {
+    fn from(v: Bool) -> Self {
+        Expr::Lit(Lit::Bool(v))
+    }
+}
+
+impl From<Number> for Expr {
+    fn from(v: Number) -> Self {
+        Expr::Lit(Lit::Num(v))
+    }
+}
+
+impl From<Str> for Expr {
+    fn from(v: Str) -> Self {
+        Expr::Lit(Lit::Str(v))
+    }
+}

ecmascript/ast/src/module_decl.rs

@@ -1,5 +1,5 @@
 use crate::{
-    decl::{Decl, VarDecl},
+    decl::Decl,
     expr::{ClassExpr, Expr, FnExpr},
     ident::Ident,
     lit::Str,
@@ -53,8 +53,6 @@ pub enum ExportDefaultDecl {
 
     Fn(FnExpr),
 
-    Var(VarDecl),
-
     TsInterfaceDecl(TsInterfaceDecl),
 }
 

ecmascript/codegen/src/lib.rs

@@ -133,7 +133,6 @@ impl<'a> Emitter<'a> {
         match *node {
             ExportDefaultDecl::Class(ref n) => emit!(n),
             ExportDefaultDecl::Fn(ref n) => emit!(n),
-            ExportDefaultDecl::Var(ref n) => emit!(n),
             ExportDefaultDecl::TsInterfaceDecl(ref n) => emit!(n),
         }
         semi!();

ecmascript/transforms/Cargo.toml

@@ -14,12 +14,13 @@ swc_common = { path ="../../common" }
 swc_ecma_ast = { path ="../ast" }
 swc_ecma_parser = { path ="../parser", features = ["verify"] }
 either = "1.5"
-fnv = "1"
+fxhash = "0.2"
 lazy_static = "1"
 objekt = "0.1"
 serde = { version = "1", features = ["derive"] }
 indexmap = "1"
 ordered-float = "1.0.1"
+Inflector = { version = "0.11.4", default-features = false }
 
 [dev-dependencies]
 testing = { path ="../../testing" }

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

@@ -113,13 +113,7 @@ impl Fold<Expr> for Arrow {
 
                 Expr::Call(CallExpr {
                     span,
-                    callee: Expr::Member(MemberExpr {
-                        span,
-                        obj: ExprOrSuper::Expr(box fn_expr),
-                        prop: box quote_ident!("bind").into(),
-                        computed: false,
-                    })
-                    .as_callee(),
+                    callee: fn_expr.member(quote_ident!("bind")).as_callee(),
                     args: vec![ThisExpr { span: DUMMY_SP }.as_arg()],
                     type_args: Default::default(),
                 })

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

@@ -2,7 +2,7 @@ use super::*;
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     destructuring,
     r#"let foo = ({bar}) => undefined;"#,
     r#"let foo = function ({bar}) {
@@ -12,7 +12,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     basic,
     r#"let echo = (bar) => bar"#,
     r#"let echo = function(bar) {
@@ -22,7 +22,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     empty_arguments,
     r#"var t = () => 5 + 5;"#,
     r#"var t = function () {
@@ -32,7 +32,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     expression,
     r#"arr.map(x => x * x);"#,
     r#"arr.map(function (x) {
@@ -42,7 +42,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     inside_call,
     r#"arr.map(i => i + 1);"#,
     r#"arr.map(function (i) {
@@ -52,7 +52,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     multiple_arguments,
     r#"var t = (i, x) => i * x;"#,
     r#"var t = function (i, x) {
@@ -61,7 +61,7 @@ test!(
 );
 
 // test!(::swc_ecma_parser::Syntax::default(),
-//     Arrow,
+//     |_, _| Arrow,
 //     nested,
 //     r#"module.exports = {
 //   init: function () {
@@ -96,7 +96,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     paren_insertion,
     r#"var t = i => i * 5;"#,
     r#"var t = function (i) {
@@ -106,7 +106,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     single_argument,
     r#"var t = (i) => i * 5;"#,
     r#"var t = function (i) {
@@ -116,7 +116,7 @@ test!(
 
 test!(
     ::swc_ecma_parser::Syntax::default(),
-    Arrow,
+    |_, _| Arrow,
     statement,
     r#"nums.forEach(v => {
   if (v % 5 === 0) {

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

@@ -34,7 +34,7 @@ mod tests {
 
     test!(
         ::swc_ecma_parser::Syntax::default(),
-        BlockScopedFns,
+        |_, _| BlockScopedFns,
         basic,
         r#"{
   function name (n) {

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

@@ -365,16 +365,9 @@ pub(super) fn make_possible_return_value(helpers: &Helpers, mode: ReturningMode)
                 vec![ThisExpr { span: DUMMY_SP }.as_arg(), {
                     let apply = box Expr::Call(CallExpr {
                         span: DUMMY_SP,
-                        callee: MemberExpr {
-                            span: DUMMY_SP,
-                            obj: ExprOrSuper::Expr(box get_prototype_of(
-                                helpers,
-                                &Expr::Ident(class_name),
-                            )),
-                            computed: false,
-                            prop: box Expr::Ident(fn_name),
-                        }
-                        .as_callee(),
+                        callee: get_prototype_of(helpers, &Expr::Ident(class_name))
+                            .member(fn_name)
+                            .as_callee(),
 
                         // super(foo, bar) => possibleReturnCheck(this, foo, bar)
                         args,

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

@@ -186,12 +186,7 @@ impl<'a> SuperCalleeFolder<'a> {
                 Expr::Ident(self.class_name.clone())
             } else {
                 // Foo.prototype
-                Expr::Member(MemberExpr {
-                    span: super_token,
-                    obj: ExprOrSuper::Expr(box Expr::Ident(self.class_name.clone())),
-                    prop: box Expr::Ident(quote_ident!("prototype")),
-                    computed: false,
-                })
+                self.class_name.clone().member(quote_ident!("prototype"))
             },
         )
         .as_arg();
@@ -271,12 +266,7 @@ impl<'a> SuperCalleeFolder<'a> {
 
         let proto_arg = get_prototype_of(
             self.helpers,
-            &Expr::Member(MemberExpr {
-                span: super_token,
-                obj: ExprOrSuper::Expr(box Expr::Ident(self.class_name.clone())),
-                prop: box Expr::Ident(quote_ident!("prototype")),
-                computed: false,
-            }),
+            &self.class_name.clone().member(quote_ident!("prototype")),
         )
         .as_arg();