fix(es/compat): Ignore this in nested scopes in classes pass (#6796)

**Related issue:** - Closes #6506.
swc-project · Jan 12, 2023 · 07676d5 · 07676d5
1 parent 2efcbdd
commit 07676d5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/crates/swc/tests/exec.rs b/crates/swc/tests/exec.rs
@@ -55,6 +55,10 @@ fn init_helpers() -> Arc<PathBuf> {
 
         let helper_dir = project_root.join("packages").join("swc-helpers");
 
+        if env::var("SKIP_HELPERS").unwrap_or_default() == "1" {
+            return Arc::new(helper_dir);
+        }
+
         let yarn = find_executable("yarn").expect("failed to find yarn");
         let npm = find_executable("npm").expect("failed to find npm");
         {

diff --git a/crates/swc/tests/exec/issues-6xxx/6506/1/exec.js b/crates/swc/tests/exec/issues-6xxx/6506/1/exec.js
@@ -0,0 +1,16 @@
+class Foo { }
+
+class Bar extends Foo {
+    constructor() {
+        super();
+        this.node = 1;
+        const self = this;
+        this.root = {
+            get node() {
+                return self.node;
+            }
+        };
+    }
+}
+
+console.log((new Bar()).root.node);
diff --git a/crates/swc/tests/tsc-references/derivedClassSuperProperties.1.normal.js b/crates/swc/tests/tsc-references/derivedClassSuperProperties.1.normal.js
@@ -486,7 +486,7 @@ var DerivedWithObjectAccessors = /*#__PURE__*/ function(Base) {
         var _this;
         var obj = {
             get prop () {
-                return _possible_constructor_return(_this, true);
+                return true;
             },
             set prop (param){
                 _this._prop = param;
@@ -509,7 +509,7 @@ var DerivedWithObjectAccessorsUsingThisInKeys = /*#__PURE__*/ function(Base) {
         var obj = (_obj = {
             _prop: "prop"
         }, _mutatorMap[_this.propName] = _mutatorMap[_this.propName] || {}, _mutatorMap[_this.propName].get = function() {
-            return _possible_constructor_return(_this, true);
+            return true;
         }, _mutatorMap[_this.propName] = _mutatorMap[_this.propName] || {}, _mutatorMap[_this.propName].set = function(param1) {
             _this._prop = param1;
         }, _define_enumerable_properties(_obj, _mutatorMap), _obj);
@@ -529,7 +529,7 @@ var DerivedWithObjectAccessorsUsingThisInBodies = /*#__PURE__*/ function(Base) {
         var obj = {
             _prop: "prop",
             get prop () {
-                return _possible_constructor_return(_this, _this._prop);
+                return _this._prop;
             },
             set prop (param){
                 _this._prop = param;

diff --git a/crates/swc_ecma_transforms_compat/src/es2015/classes/constructor.rs b/crates/swc_ecma_transforms_compat/src/es2015/classes/constructor.rs
@@ -187,6 +187,10 @@ impl VisitMut for ConstructorFolder<'_> {
 
     ignore_return!(visit_mut_constructor, Constructor);
 
+    ignore_return!(visit_mut_getter_prop, GetterProp);
+
+    ignore_return!(visit_mut_setter_prop, SetterProp);
+
     fn visit_mut_function(&mut self, _: &mut Function) {}
 
     fn visit_mut_expr(&mut self, expr: &mut Expr) {