JS: Also resolve re-exports using new resolution

Author: asgerf

javascript/ql/lib/semmle/javascript/ES2015Modules.qll

@@ -2,6 +2,7 @@
 
 import javascript
 private import semmle.javascript.internal.CachedStages
+private import semmle.javascript.internal.paths.PathExprResolver
 
 /**
  * An ECMAScript 2015 module.
@@ -725,22 +726,7 @@ abstract class ReExportDeclaration extends ExportDeclaration {
   cached
   Module getReExportedModule() {
     Stages::Imports::ref() and
-    result.getFile() = this.getEnclosingModule().resolve(this.getImportedPath())
-    or
-    result = this.resolveFromTypeRoot()
-  }
-
-  /**
-   * Gets a module in a `node_modules/@types/` folder that matches the imported module name.
-   */
-  private Module resolveFromTypeRoot() {
-    result.getFile() =
-      min(TypeRootFolder typeRoot |
-        |
-        typeRoot.getModuleFile(this.getImportedPath().getStringValue())
-        order by
-          typeRoot.getSearchPriority(this.getFile().getParentContainer())
-      )
+    result.getFile() = ImportPathResolver::resolveExpr(this.getImportedPath())
   }
 }
 

javascript/ql/lib/semmle/javascript/Modules.qll

@@ -115,10 +115,6 @@ abstract class Module extends TopLevel {
   }
 }
 
-private predicate shouldResolveExpr(Expr e) { e = any(Import imprt).getImportedPathExpr() }
-
-private module Resolver = ResolveExpr<shouldResolveExpr/1>;
-
 /**
  * An import in a module, which may be an ECMAScript 2015-style
  * `import` statement, a CommonJS-style `require` import, or an AMD dependency.

javascript/ql/lib/semmle/javascript/internal/paths/PathExprResolver.qll

@@ -244,3 +244,12 @@ module ResolveExpr<exprSig/1 shouldResolveExpr> {
     query predicate getFileFromFolderImport_ = getFileFromFolderImport/1;
   }
 }
+
+private predicate isImportPathExpr(Expr e) {
+  e = any(Import imprt).getImportedPathExpr()
+  or
+  e = any(ReExportDeclaration decl).getImportedPath()
+}
+
+/** Resolves paths in imports and re-exports. */
+module ImportPathResolver = ResolveExpr<isImportPathExpr/1>;