JS: Deprecate TypeAnnotation.hasQualifiedName

Author: asgerf

javascript/ql/lib/semmle/javascript/ApiGraphs.qll

@@ -744,7 +744,7 @@ module API {
       MkModuleImport(string m) {
         imports(_, m)
         or
-        any(TypeAnnotation n).hasQualifiedName(m, _)
+        any(TypeAnnotation n).hasUnderlyingType(m, _)
         or
         any(Type t).hasUnderlyingType(m, _)
       } or
@@ -753,7 +753,7 @@ module API {
       MkUse(DataFlow::Node nd) { use(_, _, nd) } or
       /** A use of a TypeScript type. */
       MkTypeUse(string moduleName, string exportName) {
-        any(TypeAnnotation n).hasQualifiedName(moduleName, exportName)
+        any(TypeAnnotation n).hasUnderlyingType(moduleName, exportName)
         or
         any(Type t).hasUnderlyingType(moduleName, exportName)
       } or

javascript/ql/lib/semmle/javascript/TypeAnnotations.qll

@@ -77,16 +77,36 @@ class TypeAnnotation extends @type_annotation, NodeInStmtContainer {
   TypeAnnotation getAnUnderlyingType() { result = this }
 
   /**
+   * DEPRECATED. Use `hasUnderlyingType` instead.
+   *
    * Holds if this is a reference to the type with qualified name `globalName` relative to the global scope.
    */
-  final predicate hasQualifiedName(string globalName) {
+  deprecated predicate hasQualifiedName(string globalName) {
     UnderlyingTypes::nodeHasUnderlyingType(this, "global", globalName)
   }
 
   /**
+   * DEPRECATED. Use `hasUnderlyingType` instead.
+   *
    * Holds if this is a reference to the type exported from `moduleName` under the name `exportedName`.
    */
-  final predicate hasQualifiedName(string moduleName, string exportedName) {
+  deprecated predicate hasQualifiedName(string moduleName, string exportedName) {
+    UnderlyingTypes::nodeHasUnderlyingType(this, moduleName, exportedName)
+  }
+
+  /**
+   * Holds if this is a reference to the type with qualified name `globalName` relative to the global scope,
+   * or is declared as a subtype thereof, or is a union or intersection containing such a type.
+   */
+  final predicate hasUnderlyingType(string globalName) {
+    UnderlyingTypes::nodeHasUnderlyingType(this, "global", globalName)
+  }
+
+  /**
+   * Holds if this is a reference to the type exported from `moduleName` under the name `exportedName`,
+   * or is declared as a subtype thereof, or is a union or intersection containing such a type.
+   */
+  final predicate hasUnderlyingType(string moduleName, string exportedName) {
     UnderlyingTypes::nodeHasUnderlyingType(this, moduleName, exportedName)
   }
 

javascript/ql/lib/semmle/javascript/frameworks/Nest.qll

@@ -237,7 +237,7 @@ module NestJS {
     CustomPipeClass() {
       exists(ClassDefinition cls |
         this = cls.flow() and
-        cls.getASuperInterface().hasQualifiedName("@nestjs/common", "PipeTransform")
+        cls.getASuperInterface().hasUnderlyingType("@nestjs/common", "PipeTransform")
       )
     }
 

javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll

@@ -62,7 +62,7 @@ predicate isPackageUsed(string package) {
   or
   any(JS::TypeName t).hasQualifiedName(package, _)
   or
-  any(JS::TypeAnnotation t).hasQualifiedName(package, _)
+  any(JS::TypeAnnotation t).hasUnderlyingType(package, _)
   or
   exists(JS::PackageJson json | json.getPackageName() = package)
 }

javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll

@@ -60,11 +60,7 @@ private predicate neverReturnsJQuery(string name) {
     decl.getBaseName() = "jQuery" and
     decl.getName() = name
   |
-    not decl.getDocumentation()
-        .getATagByTitle("return")
-        .getType()
-        .getAnUnderlyingType()
-        .hasQualifiedName("jQuery")
+    not decl.getDocumentation().getATagByTitle("return").getType().hasUnderlyingType("jQuery")
   )
 }