JS: Do not restrict resolved imports to PathExpr

The return type of getImportedPath needs to change to Expr, which means we have to deprecate and rename it.

Next commit updates the deprecated uses of the old predicate.

Author: asgerf

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

@@ -115,7 +115,7 @@ abstract class Module extends TopLevel {
   }
 }
 
-private predicate shouldResolveExpr(Expr e) { e = any(Import imprt).getImportedPath() }
+private predicate shouldResolveExpr(Expr e) { e = any(Import imprt).getImportedPathExpr() }
 
 private module Resolver = ResolveExpr<shouldResolveExpr/1>;
 
@@ -127,8 +127,13 @@ abstract class Import extends AstNode {
   /** Gets the module in which this import appears. */
   abstract Module getEnclosingModule();
 
+  /** DEPRECATED. Use `getImportedPathExpr` instead. */
+  deprecated PathExpr getImportedPath() { none() }
+
   /** Gets the (unresolved) path that this import refers to. */
-  abstract PathExpr getImportedPath();
+  abstract Expr getImportedPathExpr();
+
+  final string getImportedPathString() { result = this.getImportedPathExpr().getStringValue() }
 
   /**
    * Gets an externs module the path of this import resolves to.
@@ -137,13 +142,18 @@ abstract class Import extends AstNode {
    * path is assumed to be a possible target of the import.
    */
   Module resolveExternsImport() {
-    result.isExterns() and result.getName() = this.getImportedPath().getValue()
+    result.isExterns() and result.getName() = this.getImportedPathString()
   }
 
   /**
    * Gets the module the path of this import resolves to.
    */
-  Module resolveImportedPath() { result.getFile() = Resolver::resolveExpr(this.getImportedPath()) }
+  Module resolveImportedPath() { result.getFile() = this.getTargetFile() }
+
+  /**
+   * Gets the module the path of this import resolves to.
+   */
+  File getTargetFile() { result = Resolver::resolveExpr(this.getImportedPathExpr()) }
 
   /**
    * DEPRECATED. Use `getImportedModule()` instead.

javascript/ql/test/library-tests/PathResolution/DirnameImports/main.js

@@ -7,9 +7,9 @@ require(__dirname + '/../import-packages.ts'); // $ importTarget=import-packages
 require(__dirname + '/' + 'target.js'); // $ importTarget=DirnameImports/target.js
 
 require(path.join(__dirname, 'target.js')); // $ importTarget=DirnameImports/target.js
-require(path.resolve(__dirname, 'target.js')); // $ MISSING: importTarget=DirnameImports/target.js // path.resolve is not a PathExpr
+require(path.resolve(__dirname, 'target.js')); // $ importTarget=DirnameImports/target.js
 
 const subdir = 'nested';
 require(__dirname + '/' + subdir + '/target.js'); // $ importTarget=DirnameImports/nested/target.js
 
-require(`${__dirname}/target.js`); // $ MISSING: importTarget=DirnameImports/target.js // TemplateLiteral is not a PathExpr
+require(`${__dirname}/target.js`); // $ importTarget=DirnameImports/target.js

javascript/ql/test/library-tests/PathResolution/test.expected

@@ -60,7 +60,9 @@ importTarget
 | DirnameImports/main.js:6:1:6:45 | require ... es.ts') | import-packages.ts |
 | DirnameImports/main.js:7:1:7:38 | require ... et.js') | DirnameImports/target.js |
 | DirnameImports/main.js:9:1:9:42 | require ... t.js')) | DirnameImports/target.js |
+| DirnameImports/main.js:10:1:10:45 | require ... t.js')) | DirnameImports/target.js |
 | DirnameImports/main.js:13:1:13:48 | require ... et.js') | DirnameImports/nested/target.js |
+| DirnameImports/main.js:15:1:15:33 | require ... et.js`) | DirnameImports/target.js |
 | Extended/src/main.ts:2:1:2:21 | import  ... /file"; | Extended/lib/file.ts |
 | Extended/src/main.ts:3:1:3:24 | import  ... le.ts"; | Extended/lib/file.ts |
 | Extended/src/main.ts:4:1:4:24 | import  ... le.js"; | Extended/lib/file.ts |