Merged ES6Class into FunctionStyleClass

Author: Napalys

javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll

@@ -1214,81 +1214,6 @@ module ClassNode {
     DataFlow::Node getADecorator() { none() }
   }
 
-  /**
-   * An ES6 class as a `ClassNode` instance.
-   */
-  private class ES6Class extends Range, DataFlow::ValueNode {
-    override ClassDefinition astNode;
-
-    override string getName() { result = astNode.getName() }
-
-    override string describe() { result = astNode.describe() }
-
-    override FunctionNode getConstructor() { result = astNode.getConstructor().getBody().flow() }
-
-    override FunctionNode getInstanceMember(string name, MemberKind kind) {
-      exists(MethodDeclaration method |
-        method = astNode.getMethod(name) and
-        not method.isStatic() and
-        kind = MemberKind::of(method) and
-        result = method.getBody().flow()
-      )
-      or
-      kind = MemberKind::method() and
-      result = this.getConstructor().getReceiver().getAPropertySource(name)
-    }
-
-    override FunctionNode getAnInstanceMember(MemberKind kind) {
-      exists(MethodDeclaration method |
-        method = astNode.getAMethod() and
-        not method.isStatic() and
-        kind = MemberKind::of(method) and
-        result = method.getBody().flow()
-      )
-      or
-      kind = MemberKind::method() and
-      result = this.getConstructor().getReceiver().getAPropertySource()
-    }
-
-    override FunctionNode getStaticMember(string name, MemberKind kind) {
-      exists(MethodDeclaration method |
-        method = astNode.getMethod(name) and
-        method.isStatic() and
-        kind = MemberKind::of(method) and
-        result = method.getBody().flow()
-      )
-      or
-      kind.isMethod() and
-      result = this.getAPropertySource(name)
-    }
-
-    override FunctionNode getAStaticMember(MemberKind kind) {
-      exists(MethodDeclaration method |
-        method = astNode.getAMethod() and
-        method.isStatic() and
-        kind = MemberKind::of(method) and
-        result = method.getBody().flow()
-      )
-      or
-      kind.isMethod() and
-      result = this.getAPropertySource()
-    }
-
-    override DataFlow::Node getASuperClassNode() { result = astNode.getSuperClass().flow() }
-
-    override TypeAnnotation getFieldTypeAnnotation(string fieldName) {
-      exists(FieldDeclaration field |
-        field.getDeclaringClass() = astNode and
-        fieldName = field.getName() and
-        result = field.getTypeAnnotation()
-      )
-    }
-
-    override DataFlow::Node getADecorator() {
-      result = astNode.getADecorator().getExpression().flow()
-    }
-  }
-
   private DataFlow::PropRef getAPrototypeReferenceInFile(string name, File f) {
     result.getBase() = AccessPath::getAReferenceOrAssignmentTo(name) and
     result.getPropertyName() = "prototype" and
@@ -1313,12 +1238,16 @@ module ClassNode {
 
   /**
    * A function definition, targeted by a `new`-call or with prototype manipulation, seen as a `ClassNode` instance.
+   * Or An ES6 class as a `ClassNode` instance.
    */
   class FunctionStyleClass extends Range, DataFlow::ValueNode {
-    override Function astNode;
+    override AST::ValueNode astNode;
     AbstractFunction function;
 
     FunctionStyleClass() {
+      astNode instanceof ClassDefinition
+      or
+      astNode instanceof Function and
       function.getFunction() = astNode and
       (
         exists(getAFunctionValueWithPrototype(function))
@@ -1333,11 +1262,17 @@ module ClassNode {
       )
     }
 
-    override string getName() { result = astNode.getName() }
+    override string getName() {
+      result = [astNode.(Function).getName(), astNode.(ClassDefinition).getName()]
+    }
 
-    override string describe() { result = astNode.describe() }
+    override string describe() {
+      result = [astNode.(Function).describe(), astNode.(ClassDefinition).describe()]
+    }
 
-    override FunctionNode getConstructor() { result = this }
+    override FunctionNode getConstructor() {
+      result = this or result = astNode.(ClassDefinition).getConstructor().getBody().flow()
+    }
 
     private PropertyAccessor getAnAccessor(MemberKind kind) {
       result.getObjectExpr() = this.getAPrototypeReference().asExpr() and
@@ -1362,6 +1297,13 @@ module ClassNode {
         accessor.getName() = name and
         result = accessor.getInit().flow()
       )
+      or
+      exists(MethodDeclaration method |
+        method = astNode.(ClassDefinition).getMethod(name) and
+        not method.isStatic() and
+        kind = MemberKind::of(method) and
+        result = method.getBody().flow()
+      )
     }
 
     override FunctionNode getAnInstanceMember(MemberKind kind) {
@@ -1375,14 +1317,35 @@ module ClassNode {
         accessor = this.getAnAccessor(kind) and
         result = accessor.getInit().flow()
       )
+      or
+      exists(MethodDeclaration method |
+        method = astNode.(ClassDefinition).getAMethod() and
+        not method.isStatic() and
+        kind = MemberKind::of(method) and
+        result = method.getBody().flow()
+      )
     }
 
     override FunctionNode getStaticMember(string name, MemberKind kind) {
+      exists(MethodDeclaration method |
+        method = astNode.(ClassDefinition).getMethod(name) and
+        method.isStatic() and
+        kind = MemberKind::of(method) and
+        result = method.getBody().flow()
+      )
+      or
       kind.isMethod() and
       result = this.getAPropertySource(name)
     }
 
     override FunctionNode getAStaticMember(MemberKind kind) {
+      exists(MethodDeclaration method |
+        method = astNode.(ClassDefinition).getAMethod() and
+        method.isStatic() and
+        kind = MemberKind::of(method) and
+        result = method.getBody().flow()
+      )
+      or
       kind.isMethod() and
       result = this.getAPropertySource()
     }
@@ -1431,6 +1394,20 @@ module ClassNode {
         this = inheritsCall.getArgument(0).getALocalSource() and
         result = inheritsCall.getArgument(1)
       )
+      or
+      result = astNode.(ClassDefinition).getSuperClass().flow()
+    }
+
+    override TypeAnnotation getFieldTypeAnnotation(string fieldName) {
+      exists(FieldDeclaration field |
+        field.getDeclaringClass() = astNode and
+        fieldName = field.getName() and
+        result = field.getTypeAnnotation()
+      )
+    }
+
+    override DataFlow::Node getADecorator() {
+      result = astNode.(ClassDefinition).getADecorator().getExpression().flow()
     }
   }
 }