Fix optional chaining in argument position (#1104)

swc-project · Sep 24, 2020 · ab8df21 · ab8df21
1 parent a9c3072
commit ab8df21
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 4 deletions.
diff --git a/ecmascript/Cargo.toml b/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.8.1"
+version = "0.8.2"
 
 [features]
 codegen = ["swc_ecma_codegen"]

diff --git a/ecmascript/transforms/Cargo.toml b/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.24.1"
+version = "0.24.2"
 
 [features]
 const-modules = ["dashmap"]

diff --git a/ecmascript/transforms/src/compat/es2020/opt_chaining.rs b/ecmascript/transforms/src/compat/es2020/opt_chaining.rs
@@ -159,7 +159,10 @@ impl OptChaining {
                         })),
                         ..expr
                     }),
-                    Err(e) => e,
+                    Err(callee) => Expr::Call(CallExpr {
+                        callee: callee.as_callee(),
+                        ..e
+                    }),
                 };
             }
             _ => {}

diff --git a/ecmascript/transforms/tests/es2020_optional_chaining.rs b/ecmascript/transforms/tests/es2020_optional_chaining.rs
@@ -614,3 +614,30 @@ test_exec!(
   expect(obj?.a?.b?.c()).toBe(2)
   "
 );
+
+test!(
+    syntax(),
+    |_| tr(()),
+    swc_node_95_2,
+    "
+obj?.a?.b?.c()
+",
+    "
+    var ref, ref1;
+obj === null || obj === void 0 ? void 0 : (ref = obj.a) === null || ref === void 0 ? void 0 : \
+     (ref1 = ref.b) === null || ref1 === void 0 ? void 0 : ref1.c();"
+);
+
+test!(
+    syntax(),
+    |_| tr(()),
+    swc_node_95_3,
+    "
+expect(obj?.a?.b?.c()).toBe(2)
+",
+    "
+    var ref, ref1;
+expect(obj === null || obj === void 0 ? void 0 : (ref = obj.a) === null || ref === void 0 ? void 0 \
+     : (ref1 = ref.b) === null || ref1 === void 0 ? void 0 : ref1.c()).toBe(2);
+"
+);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/core",
-  "version": "1.2.32",
+  "version": "1.2.33",
   "description": "Super-fast alternative for babel",
   "homepage": "https://swc.rs",
   "main": "./index.js",

diff --git a/...tests/pass/deno-001/simple-5/input/.swcrc → ...ests/pass/deno-001/.simple-5/input/.swcrc b/...tests/pass/deno-001/simple-5/input/.swcrc → ...ests/pass/deno-001/.simple-5/input/.swcrc
diff --git a/...deno-001/simple-5/input/async/deferred.ts → ...eno-001/.simple-5/input/async/deferred.ts b/...deno-001/simple-5/input/async/deferred.ts → ...eno-001/.simple-5/input/async/deferred.ts
diff --git a/...pass/deno-001/simple-5/input/async/mod.ts → ...ass/deno-001/.simple-5/input/async/mod.ts b/...pass/deno-001/simple-5/input/async/mod.ts → ...ass/deno-001/.simple-5/input/async/mod.ts
diff --git a/...imple-5/input/async/mux_async_iterator.ts → ...imple-5/input/async/mux_async_iterator.ts b/...imple-5/input/async/mux_async_iterator.ts → ...imple-5/input/async/mux_async_iterator.ts
diff --git a/...sts/pass/deno-001/simple-5/input/entry.js → ...ts/pass/deno-001/.simple-5/input/entry.js b/...sts/pass/deno-001/simple-5/input/entry.js → ...ts/pass/deno-001/.simple-5/input/entry.js
diff --git a/...ts/pass/deno-001/simple-5/output/entry.js → ...s/pass/deno-001/.simple-5/output/entry.js b/...ts/pass/deno-001/simple-5/output/entry.js → ...s/pass/deno-001/.simple-5/output/entry.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,7 +159,10 @@ impl OptChaining { @@
                             })),
                             ..expr
                         }),
-                        Err(e) => e,
+                        Err(callee) => Expr::Call(CallExpr {
+                            callee: callee.as_callee(),
+                            ..e
+                        }),
                     };
                 }
                 _ => {}
@@ Expand Down @@