JS: Update deprecated uses of Import.getImportedPath()

Author: asgerf

javascript/ql/lib/definitions.qll

@@ -70,7 +70,7 @@ private predicate importLookup(AstNode path, Module target, string kind) {
   kind = "I" and
   (
     exists(Import i |
-      path = i.getImportedPath() and
+      path = i.getImportedPathExpr() and
       target = i.getImportedModule()
     )
     or

javascript/ql/lib/semmle/javascript/AMD.qll

@@ -265,7 +265,7 @@ private class AmdDependencyImport extends Import {
 
   override Module getEnclosingModule() { this = result.(AmdModule).getDefine().getADependency() }
 
-  override PathExpr getImportedPath() { result = this }
+  override Expr getImportedPathExpr() { result = this }
 
   /**
    * Gets a file that looks like it might be the target of this import.
@@ -298,7 +298,7 @@ private class AmdDependencyImport extends Import {
   private predicate targetCandidate(
     File f, string abspath, PathString imported, string dirname, string basename
   ) {
-    imported = this.getImportedPath().getValue() and
+    imported = this.getImportedPathString() and
     f.getStem() = imported.getStem() and
     f.getAbsolutePath() = abspath and
     dirname = imported.getDirName() and

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

@@ -91,7 +91,7 @@ private predicate hasDefaultExport(ES2015Module mod) {
 class ImportDeclaration extends Stmt, Import, @import_declaration {
   override ES2015Module getEnclosingModule() { result = this.getTopLevel() }
 
-  override PathExpr getImportedPath() { result = this.getChildExpr(-1) }
+  override Expr getImportedPathExpr() { result = this.getChildExpr(-1) }
 
   /**
    * Gets the object literal passed as part of the `with` (or `assert`) clause in this import declaration.

javascript/ql/lib/semmle/javascript/Expr.qll

@@ -2821,7 +2821,7 @@ class DynamicImportExpr extends @dynamic_import, Expr, Import {
     result = this.getSource().getFirstControlFlowNode()
   }
 
-  override PathExpr getImportedPath() { result = this.getSource() }
+  override Expr getImportedPathExpr() { result = this.getSource() }
 
   /**
    * Gets the second "argument" to the import expression, that is, the `Y` in `import(X, Y)`.

javascript/ql/lib/semmle/javascript/NodeJS.qll

@@ -237,7 +237,7 @@ private class RequireVariable extends Variable {
 }
 
 private predicate isModuleModule(EarlyStageNode nd) {
-  exists(ImportDeclaration imp | imp.getImportedPath().getValue() = "module" |
+  exists(ImportDeclaration imp | imp.getImportedPathString() = "module" |
     nd = TDestructuredModuleImportNode(imp)
     or
     nd = TValueNode(imp.getASpecifier().(ImportNamespaceSpecifier))
@@ -263,7 +263,7 @@ private predicate isCreateRequire(EarlyStageNode nd) {
   )
   or
   exists(ImportDeclaration decl, NamedImportSpecifier spec |
-    decl.getImportedPath().getValue() = "module" and
+    decl.getImportedPathString() = "module" and
     spec = decl.getASpecifier() and
     spec.getImportedName() = "createRequire" and
     nd = TValueNode(spec)
@@ -323,7 +323,7 @@ private predicate isRequire(EarlyStageNode nd) {
 class Require extends CallExpr, Import {
   Require() { isRequire(TValueNode(this.getCallee())) }
 
-  override PathExpr getImportedPath() { result = this.getArgument(0) }
+  override Expr getImportedPathExpr() { result = this.getArgument(0) }
 
   override Module getEnclosingModule() { this = result.getAnImport() }
 
@@ -391,7 +391,7 @@ class Require extends CallExpr, Import {
    * `.js`, `.json` and `.node`.
    */
   private File load(int priority) {
-    exists(int r | this.getEnclosingModule().searchRoot(this.getImportedPath(), _, r) |
+    exists(int r | this.getEnclosingModule().searchRoot(this.getImportedPathExpr(), _, r) |
       result = loadAsFile(this, r, priority - prioritiesPerCandidate() * r) or
       result =
         loadAsDirectory(this, r,

javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll

@@ -46,7 +46,7 @@ int numberOfExtensions() { result = count(getFileExtensionPriority(_)) }
  * when resolved from the root with priority `rootPriority`.
  */
 File loadAsFile(Require req, int rootPriority, int priority) {
-  exists(PathExpr path | path = req.getImportedPath() |
+  exists(PathExpr path | path = req.getImportedPathExpr() |
     result = path.resolve(rootPriority) and priority = 0
     or
     exists(Folder encl | encl = path.resolveUpTo(path.getNumComponent() - 1, rootPriority) |
@@ -61,7 +61,7 @@ File loadAsFile(Require req, int rootPriority, int priority) {
  * priority `rootPriority`.
  */
 File loadAsDirectory(Require req, int rootPriority, int priority) {
-  exists(Folder dir | dir = req.getImportedPath().resolve(rootPriority) |
+  exists(Folder dir | dir = req.getImportedPathExpr().(PathExpr).resolve(rootPriority) |
     result = resolveMainModule(dir.(NpmPackage).getPackageJson(), priority, ".") or
     result = tryExtensions(dir, "index", priority - (numberOfExtensions() + 1))
   )

javascript/ql/lib/semmle/javascript/TypeScript.qll

@@ -207,7 +207,7 @@ class ExternalModuleReference extends Expr, Import, @external_module_reference {
   /** Gets the expression specifying the module. */
   Expr getExpression() { result = this.getChildExpr(0) }
 
-  override PathExpr getImportedPath() { result = this.getExpression() }
+  override Expr getImportedPathExpr() { result = this.getExpression() }
 
   override Module getEnclosingModule() { result = this.getTopLevel() }
 
@@ -743,7 +743,7 @@ class TypeAccess extends @typeaccess, TypeExpr, TypeRef {
  * For non-relative imports, it is the import path itself.
  */
 private string getImportName(Import imprt) {
-  exists(string path | path = imprt.getImportedPath().getValue() |
+  exists(string path | path = imprt.getImportedPathExpr().getStringValue() |
     if path.regexpMatch("[./].*")
     then result = imprt.getImportedModule().getFile().getRelativePath()
     else result = path
@@ -1731,7 +1731,7 @@ class TSGlobalDeclImport extends DataFlow::ModuleImportNode::Range {
       pkg = tt.getExpressionName() and
       // then, check pkg is imported as "import * as pkg from path"
       i.getLocal().getVariable() = pkg.getVariable() and
-      path = i.getImportedPath().getValue() and
+      path = i.getImportedPathString() and
       // finally, "this" needs to be a reference to gv
       this = DataFlow::exprNode(gv.getAnAccess())
     )

javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll

@@ -738,7 +738,7 @@ module ModuleImportNode {
     DefaultRange() {
       exists(Import i |
         this = i.getImportedModuleNode() and
-        i.getImportedPath().getValue() = path
+        i.getImportedPathString() = path
       )
       or
       // AMD require

javascript/ql/lib/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll

@@ -25,7 +25,7 @@ private class AnalyzedImportSpecifier extends AnalyzedVarDef, @import_specifier
 
   override predicate isIncomplete(DataFlow::Incompleteness cause) {
     // mark as incomplete if the import could rely on the lookup path
-    mayDependOnLookupPath(id.getImportedPath().getValue()) and
+    mayDependOnLookupPath(id.getImportedPathString()) and
     cause = "import"
     or
     // mark as incomplete if we cannot fully analyze this import

javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll

@@ -159,7 +159,7 @@ private int importsDependency(Import i, NpmPackage pkg, NpmDependency dep) {
   exists(string name |
     dep = pkg.getPackageJson().getADependenciesObject(_).getPropValue(name) and
     not exists(i.getImportedModule()) and
-    i.getImportedPath().getComponent(0) = name and
+    i.getImportedPathExpr().(PathExpr).getComponent(0) = name and
     i.getEnclosingModule() = pkg.getAModule() and
     result = distance(pkg, i.getFile())
   )