Fix multiple getters and setters (#1567)

Perryvw · web-flow · commit 8ddfbc0a8915 · 2024-07-29T20:33:43.000+02:00
* Fix multiple getters and setters

* Fix lint
diff --git a/src/transformation/visitors/class/index.ts b/src/transformation/visitors/class/index.ts
@@ -175,7 +175,9 @@ function transformClassLikeDeclaration(
     for (const member of classDeclaration.members) {
         if (ts.isAccessor(member)) {
             // Accessors
-            const accessors = getAllAccessorDeclarations(classDeclaration);
+            const symbol = context.checker.getSymbolAtLocation(member.name);
+            if (!symbol) continue;
+            const accessors = getAllAccessorDeclarations(classDeclaration, symbol, context);
             if (accessors.firstAccessor !== member) continue;
 
             const accessorsResult = transformAccessorDeclarations(context, accessors, localClassName);
@@ -227,9 +229,19 @@ function transformClassLikeDeclaration(
     return { statements: result, name: className };
 }
 
-function getAllAccessorDeclarations(classDeclaration: ts.ClassLikeDeclaration): AllAccessorDeclarations {
-    const getAccessor = classDeclaration.members.find(ts.isGetAccessor);
-    const setAccessor = classDeclaration.members.find(ts.isSetAccessor);
+function getAllAccessorDeclarations(
+    classDeclaration: ts.ClassLikeDeclaration,
+    symbol: ts.Symbol,
+    context: TransformationContext
+): AllAccessorDeclarations {
+    const getAccessor = classDeclaration.members.find(
+        (m): m is ts.GetAccessorDeclaration =>
+            ts.isGetAccessor(m) && context.checker.getSymbolAtLocation(m.name) === symbol
+    );
+    const setAccessor = classDeclaration.members.find(
+        (m): m is ts.SetAccessorDeclaration =>
+            ts.isSetAccessor(m) && context.checker.getSymbolAtLocation(m.name) === symbol
+    );
 
     // Get the first of the two (that is not undefined)
     const firstAccessor =
diff --git a/test/unit/classes/accessors.spec.ts b/test/unit/classes/accessors.spec.ts
@@ -11,6 +11,19 @@ test("get accessor", () => {
     `.expectToMatchJsResult();
 });
 
+test("multiple get accessors", () => {
+    util.testFunction`
+        class Foo {
+            _foo = "foo";
+            get foo() { return this._foo; }
+            _bar = "bar";
+            get bar() { return this._bar; }
+        }
+        const f = new Foo();
+        return f.foo + f.bar;
+    `.expectToMatchJsResult();
+});
+
 test("get accessor in base class", () => {
     util.testFunction`
         class Foo {
@@ -142,6 +155,26 @@ test("get/set accessors", () => {
     `.expectToMatchJsResult();
 });
 
+test("multiple get/set accessors", () => {
+    util.testFunction`
+        class Foo {
+            _foo = "foo";
+            get foo() { return this._foo; }
+            set foo(val: string) { this._foo = val; }
+
+            _bar = "bar";
+            get bar() { return this._bar; }
+            set bar(val: string) { this._bar = val; }
+        }
+        const f = new Foo();
+        const fooOriginal = f.foo;
+        f.foo = "fizz";
+        const barOriginal = f.bar;
+        f.bar = "buzz";
+        return [fooOriginal, f.foo, barOriginal, f.bar];
+    `.expectToMatchJsResult();
+});
+
 test("get/set accessors in base class", () => {
     util.testFunction`
         class Foo {
