CheckAccessControls: Properly detect the best instance type for a class declaration when it is returned from a function.

PiperOrigin-RevId: 736151473

Author: Closure Team

src/com/google/javascript/jscomp/CheckAccessControls.java

@@ -232,7 +232,9 @@ private void exitAccessControlScope(Node root) {
     // We need to handle declaration syntaxes separately in a way that we can't determine based on
     // the type of just one node.
     // TODO(nickreid): Determine if these can be replaced with FUNCTION and CLASS cases below.
-    if (NodeUtil.isFunctionDeclaration(n) || NodeUtil.isClassDeclaration(n)) {
+    if (NodeUtil.isFunctionDeclaration(n)
+        // isClassDeclaration returns false for many instances that we need to handle here.
+        || n.isClass()) {
       return instanceTypeFor(n.getJSType());
     }
 

test/com/google/javascript/jscomp/CheckAccessControlsTest.java

@@ -1491,6 +1491,123 @@ public void testProtectedAccessForProperties16() {
                 "}")));
   }
 
+  @Test
+  public void testProtectedAccessForProperties17() {
+    // Access in subclass field initializer where Subclass parent is SCRIPT.
+    test(
+        srcs(
+            """
+            class SuperClass {
+              /** @protected @return {number} */
+              getNum() { return 1; }
+            }
+            """,
+            """
+            class Subclass extends SuperClass {
+              numField = this.getNum();
+            }
+            """));
+  }
+
+  @Test
+  public void testProtectedAccessForProperties18() {
+    // Access in subclass field initializer where Subclass parent is BLOCK.
+    test(
+        srcs(
+            """
+            class SuperClass {
+              /** @protected @return {number} */
+              getNum() { return 1; }
+            }
+            """,
+            """
+            {
+              class Subclass extends SuperClass {
+                numField = this.getNum();
+              }
+            }
+            """));
+  }
+
+  @Test
+  public void testProtectedAccessForProperties19() {
+    // Access in subclass field initializer where class parent is ASSIGN.
+    test(
+        srcs(
+            """
+            class SuperClass {
+              /** @protected @return {number} */
+              getNum() { return 1; }
+            }
+            """,
+            """
+            const Subclass = class extends SuperClass {
+              numField = this.getNum();
+            }
+            """));
+  }
+
+  @Test
+  public void testProtectedAccessForProperties20() {
+    // Access in subclass field initializer where class parent is FUNCTION.
+    test(
+        srcs(
+            """
+            class SuperClass {
+              /** @protected @return {number} */
+              getNum() { return 1; }
+            }
+            """,
+            """
+            const Subclass = (() => class extends SuperClass {
+              numField = this.getNum();
+            })();
+            """));
+  }
+
+  @Test
+  public void testProtectedAccessForProperties21() {
+    // Access in subclass field initializer where class parent is RETURN.
+    test(
+        srcs(
+            """
+            class SuperClass {
+              /** @protected @return {number} */
+              getNum() { return 1; }
+            }
+            """,
+            """
+            function classGenerator() {
+              return class extends SuperClass {
+                numField = this.getNum();
+              };
+            }
+            const Subclass = classGenerator();
+            """));
+  }
+
+  @Test
+  public void testProtectedAccessForProperties22() {
+    // Access in subclass field initializer where class parent is GETPROP.
+    test(
+        srcs(
+            """
+            class SuperClass {
+              /** @protected @return {number} */
+              getNum() { return 1; }
+            }
+            """,
+            """
+            function getValue() {
+              return class extends SuperClass {
+                numField = this.getNum();
+                static staticField = 1;
+              }.staticField;
+            }
+            const value = getValue();
+            """));
+  }
+
   @Test
   public void testProtectedPropAccess_inDifferentFile_inSubclass_throughDestructuring() {
     test(