Fix bugs (#1143)

swc_ecma_transforms:
 - fixer: Fix conditional expression in await expressions. (#1133)
 - optional_chaining: Fix call expression. (#1136)
 - hygiene: Fix codegen of computed keys. (#1140)

Author: kdy1

ecmascript/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0/MIT"
 name = "swc_ecmascript"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.9.0"
+version = "0.9.1"
 
 [features]
 codegen = ["swc_ecma_codegen"]

ecmascript/transforms/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0/MIT"
 name = "swc_ecma_transforms"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.25.0"
+version = "0.25.1"
 
 [features]
 const-modules = ["dashmap"]

ecmascript/transforms/src/compat/es2020/opt_chaining.rs

@@ -2,7 +2,7 @@ use crate::{
     perf::Check,
     util::{prepend, undefined, ExprFactory, StmtLike},
 };
-use std::{fmt::Debug, iter::once, mem};
+use std::{iter::once, mem};
 use swc_common::{Spanned, DUMMY_SP};
 use swc_ecma_ast::*;
 use swc_ecma_transforms_macros::fast_path;
@@ -13,9 +13,10 @@ pub fn optional_chaining() -> impl Fold {
     OptChaining::default()
 }
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 struct OptChaining {
-    vars: Vec<VarDeclarator>,
+    vars_without_init: Vec<VarDeclarator>,
+    vars_with_init: Vec<VarDeclarator>,
 }
 
 #[fast_path(ShouldWork)]
@@ -56,24 +57,39 @@ impl OptChaining {
         Vec<T>: FoldWith<Self>,
     {
         // This is to support nested block statements
-        let old = mem::replace(&mut self.vars, vec![]);
+        let old_no_init = mem::replace(&mut self.vars_without_init, vec![]);
+        let old_init = mem::replace(&mut self.vars_with_init, vec![]);
+
+        let mut new: Vec<T> = vec![];
 
-        let mut stmts = stmts.fold_children_with(self);
+        for stmt in stmts {
+            let stmt = stmt.fold_with(self);
+            if !self.vars_with_init.is_empty() {
+                new.push(T::from_stmt(Stmt::Decl(Decl::Var(VarDecl {
+                    span: DUMMY_SP,
+                    declare: false,
+                    kind: VarDeclKind::Var,
+                    decls: mem::replace(&mut self.vars_with_init, vec![]),
+                }))));
+            }
+            new.push(stmt);
+        }
 
-        if !self.vars.is_empty() {
+        if !self.vars_without_init.is_empty() {
             prepend(
-                &mut stmts,
+                &mut new,
                 T::from_stmt(Stmt::Decl(Decl::Var(VarDecl {
                     span: DUMMY_SP,
                     declare: false,
                     kind: VarDeclKind::Var,
-                    decls: mem::replace(&mut self.vars, vec![]),
+                    decls: mem::replace(&mut self.vars_without_init, vec![]),
                 }))),
             );
         }
 
-        self.vars = old;
-        stmts
+        self.vars_without_init = old_no_init;
+        self.vars_with_init = old_init;
+        new
     }
 }
 
@@ -335,7 +351,7 @@ impl OptChaining {
                     Expr::Ident(..) => (Box::new(obj.clone()), Box::new(obj), e.expr),
                     _ => {
                         let i = private_ident!(obj_span, "ref");
-                        self.vars.push(VarDeclarator {
+                        self.vars_without_init.push(VarDeclarator {
                             span: obj_span,
                             definite: false,
                             name: Pat::Ident(i.clone()),
@@ -420,7 +436,7 @@ impl OptChaining {
                             "_obj",
                         );
                         let obj = if !is_super_access && aliased {
-                            self.vars.push(VarDeclarator {
+                            self.vars_with_init.push(VarDeclarator {
                                 span: obj_span,
                                 definite: false,
                                 name: Pat::Ident(this_obj.clone()),
@@ -432,7 +448,7 @@ impl OptChaining {
                             obj
                         };
                         let i = private_ident!(obj_span, "ref");
-                        self.vars.push(VarDeclarator {
+                        self.vars_without_init.push(VarDeclarator {
                             span: obj_span,
                             definite: false,
                             name: Pat::Ident(i.clone()),

ecmascript/transforms/src/fixer.rs

@@ -80,6 +80,18 @@ impl VisitMut for Fixer<'_> {
         self.ctx = old;
     }
 
+    fn visit_mut_await_expr(&mut self, expr: &mut AwaitExpr) {
+        let old = self.ctx;
+        self.ctx = Context::ForcedExpr { is_var_decl: false };
+        expr.arg.visit_mut_with(self);
+        self.ctx = old;
+
+        match &*expr.arg {
+            Expr::Cond(..) => self.wrap(&mut expr.arg),
+            _ => {}
+        }
+    }
+
     fn visit_mut_call_expr(&mut self, node: &mut CallExpr) {
         let old = self.ctx;
         self.ctx = Context::ForcedExpr { is_var_decl: false };
@@ -970,4 +982,11 @@ var store = global[SHARED] || (global[SHARED] = {});
     );
 
     identical!(issue_1093, "const x = (fnA || fnB)();");
+
+    identical!(
+        issue_1133,
+        "async function foo() {
+            const item = await (data === null || data === void 0 ? void 0 : data.foo());
+        }"
+    );
 }

ecmascript/transforms/src/hygiene/ops.rs

@@ -204,6 +204,7 @@ impl<'a> VisitMut for Operator<'a> {
     }
 
     fn visit_mut_key_value_prop(&mut self, p: &mut KeyValueProp) {
+        p.key.visit_mut_with(self);
         p.value.visit_mut_with(self);
     }
 

ecmascript/transforms/src/resolver/tests.rs

@@ -1679,3 +1679,38 @@ to!(
     }
     "
 );
+
+to!(
+    issue_1140,
+    r#"
+    const categories = [{ key: "apple" }, { key: "banana" }, { key: "strawberry" }];
+
+    const item = "some item";
+
+    const catNames = categories.reduce((a, item) => {
+    return { ...a, [item.key.toString()]: item };
+    }, {});
+    "#,
+    r#"
+    var categories = [
+        {
+            key: "apple"
+        },
+        {
+            key: "banana"
+        },
+        {
+            key: "strawberry"
+        }
+    ];
+    var item = "some item";
+    var catNames = categories.reduce((a, item1)=>{
+        return {
+            ...a,
+            [item1.key.toString()]: item1
+        };
+    }, {
+    });
+
+    "#
+);

ecmascript/transforms/tests/es2020_optional_chaining.rs

@@ -667,3 +667,38 @@ const r = d === null || d === void 0 ? void 0 : d.filter(i => Math.random() > 0.
      JSON.stringify(i));
   "
 );
+
+test!(
+    syntax(),
+    |_| tr(()),
+    issue_1133_1,
+    "
+async function foo() {
+  const item = await data?.foo();
+}
+    ",
+    "
+    async function foo() {
+      const item = await (data === null || data === void 0 ? void 0 : data.foo());
+    }
+    "
+);
+
+test!(
+    syntax(),
+    |_| tr(()),
+    issue_1136_1,
+    "
+    const PATCHES = new Map();
+
+    const ident = 'foo';
+    const patch = PATCHES.get(ident)?.();
+    ",
+    "
+    var ref;
+    const PATCHES = new Map();
+    const ident = \"foo\";
+    var _obj = PATCHES.get(ident);
+    const patch = (ref = _obj) === null || ref === void 0 ? void 0 : ref.call(_obj);
+    "
+);

ecmascript/transforms/tests/modules_umd.rs

@@ -1908,7 +1908,7 @@ test!(
   })(this, function() {
       \"use strict\";
       async function foo() {
-          await exports === undefined ? new Promise(function(resolve, reject) {
+          await (exports === undefined ? new Promise(function(resolve, reject) {
               require([
                   \"foo\"
               ], function(dep) {
@@ -1918,7 +1918,7 @@ test!(
               });
           }) : Promise.resolve().then(function() {
               return require(\"foo\");
-          });
+          }));
       }
   });      
     ",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swc/core",
-  "version": "1.2.35",
+  "version": "1.2.36",
   "description": "Super-fast alternative for babel",
   "homepage": "https://swc.rs",
   "main": "./index.js",