JS: Also provide underlying types for JSDoc

Author: asgerf

javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll

@@ -10,7 +10,7 @@ private import javascript
 module TypeResolution {
   private class NodeBase =
     @expr or @typeexpr or @lexical_name or @toplevel or @function_decl_stmt or @class_decl_stmt or
-        @namespace_declaration or @enum_declaration;
+        @namespace_declaration or @enum_declaration or @jsdoc_type_expr;
 
   /**
    * A node in a graph which we use to perform name and type resolution.
@@ -20,12 +20,16 @@ module TypeResolution {
       result = this.(AstNode).toString()
       or
       result = this.(LexicalName).toString()
+      or
+      result = this.(JSDocTypeExpr).toString()
     }
 
     Location getLocation() {
       result = this.(AstNode).getLocation()
       or
       result = this.(LocalVariable).getLocation()
+      or
+      result = this.(JSDocTypeExpr).getLocation()
     }
   }
 

javascript/ql/lib/semmle/javascript/internal/UnderlyingTypes.qll

@@ -104,6 +104,31 @@ module UnderlyingTypes {
       node1 = e.getExpression() and
       node2 = e
     )
+    or
+    exists(JSDocUnionTypeExpr type |
+      node1 = type.getAnAlternative() and
+      node2 = type
+    )
+    or
+    exists(JSDocNonNullableTypeExpr type |
+      node1 = type.getTypeExpr() and
+      node2 = type
+    )
+    or
+    exists(JSDocNullableTypeExpr type |
+      node1 = type.getTypeExpr() and
+      node2 = type
+    )
+    or
+    exists(JSDocAppliedTypeExpr type |
+      node1 = type.getHead() and
+      node2 = type
+    )
+    or
+    exists(JSDocOptionalParameterTypeExpr type |
+      node1 = type.getUnderlyingType() and
+      node2 = type
+    )
   }
 
   bindingset[a, b]
@@ -123,6 +148,12 @@ module UnderlyingTypes {
       name = append(prefix, step)
     )
     or
+    exists(JSDocNamedTypeExpr type |
+      node = type and
+      type.hasQualifiedName(name) and
+      mod = "global"
+    )
+    or
     exists(Node mid | nodeHasUnderlyingType(mid, mod, name) |
       TypeFlow::step(mid, node)
       or