JS: Add subclassing test and fix lack of subclassing handling

asgerf · asgerf · commit 9313564e64d5 · 2024-04-09T14:32:58.000+02:00
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -372,4 +372,10 @@ predicate apiGraphHasEdge(API::Node pred, string path, API::Node succ) {
   )
   or
   succ = pred.getPromised() and path = "Awaited"
+  or
+  exists(DataFlow::ClassNode cls |
+    pred = API::Internal::getClassInstance(cls.getADirectSubClass()) and
+    succ = API::Internal::getClassInstance(cls) and
+    path = ""
+  )
 }
diff --git a/javascript/ql/test/library-tests/ModelGeneration/ModelGeneration.expected b/javascript/ql/test/library-tests/ModelGeneration/ModelGeneration.expected
@@ -36,9 +36,11 @@ typeModel
 | (semi-internal-class).getAnonymous~expr2 | (semi-internal-class).getAnonymous~expr1 | Member[method] |
 | (subclass).A | subclass | Member[A] |
 | (subclass).A.prototype | (subclass).A | Instance |
+| (subclass).A.prototype | (subclass).B.prototype |  |
 | (subclass).A.prototype.a | (subclass).A.prototype | Member[a] |
 | (subclass).B | subclass | Member[B] |
 | (subclass).B.prototype | (subclass).B | Instance |
+| (subclass).B.prototype | (subclass).C.prototype |  |
 | (subclass).B.prototype.b | (subclass).B.prototype | Member[b] |
 | (subclass).C | subclass | Member[C] |
 | (subclass).C.prototype | (subclass).C | Instance |
diff --git a/javascript/ql/test/library-tests/ModelGeneration/subclass/subclass.js b/javascript/ql/test/library-tests/ModelGeneration/subclass/subclass.js
@@ -2,10 +2,10 @@ export class A {
     a() {}
 }
 
-export class B {
+export class B extends A {
     b() {}
 }
 
-export class C {
+export class C extends B {
     c() {}
 }

Original file line number	Diff line number	Diff line change
`@@ -372,4 +372,10 @@ predicate apiGraphHasEdge(API::Node pred, string path, API::Node succ) {`
`372`	`372`	`)`
`373`	`373`	`or`
`374`	`374`	`succ = pred.getPromised() and path = "Awaited"`
	`375`	`+ or`
	`376`	`+ exists(DataFlow::ClassNode cls \|`
	`377`	`+ pred = API::Internal::getClassInstance(cls.getADirectSubClass()) and`
	`378`	`+ succ = API::Internal::getClassInstance(cls) and`
	`379`	`+ path = ""`
	`380`	`+ )`
`375`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ export class A {`
`2`	`2`	`a() {}`
`3`	`3`	`}`
`4`	`4`
`5`		`-export class B {`
	`5`	`+export class B extends A {`
`6`	`6`	`b() {}`
`7`	`7`	`}`
`8`	`8`
`9`		`-export class C {`
	`9`	`+export class C extends B {`
`10`	`10`	`c() {}`
`11`	`11`	`}`