JS: Fix handling of re-exported paths

Author: asgerf

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

@@ -33,9 +33,12 @@ module UnderlyingTypes {
    * If `mod` is the string `"global"`, `node` refers to a global access path.
    */
   predicate nodeRefersToModule(Node node, string mod, string qualifiedName) {
-    exists(Import imprt |
-      node = imprt.getImportedPath() and
-      mod = normalizeModuleName(imprt.getImportedPath().getValue()) and
+    exists(PathExpr path |
+      path = any(Import imprt).getImportedPath() or
+      path = any(ReExportDeclaration e).getImportedPath()
+    |
+      node = path and
+      mod = normalizeModuleName(path.getValue()) and
       isExternalModuleName(mod) and
       qualifiedName = ""
     )

javascript/ql/test/library-tests/UnderlyingTypes/expressWrapperExport.use.ts

@@ -7,16 +7,16 @@ function t1(req: Request) { // none
 function t2(res: Response) { // none
 }
 
-function t3(req: wrapper.Request) { // $ MISSING: hasUnderlyingType='express'.Request
+function t3(req: wrapper.Request) { // $ hasUnderlyingType='express'.Request
 }
 
-function t4(res: wrapper.Response) { // $ MISSING: hasUnderlyingType='express'.Response
+function t4(res: wrapper.Response) { // $ hasUnderlyingType='express'.Response
 }
 
-function t5(req: w.wrapper.Request) { // $ MISSING: hasUnderlyingType='express'.Request
+function t5(req: w.wrapper.Request) { // $ hasUnderlyingType='express'.Request
 }
 
-function t6(res: w.wrapper.Response) { // $ MISSING: hasUnderlyingType='express'.Response
+function t6(res: w.wrapper.Response) { // $ hasUnderlyingType='express'.Response
 }
 
 function t7(req: w.Request) { // none