Rename StringAsPath->FilePath, isRelativePath->isDotRelativePath

Author: asgerf

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

@@ -282,7 +282,7 @@ private class AmdDependencyImport extends Import {
    * adding well-known JavaScript file extensions like `.js`.
    */
   private File guessTarget() {
-    exists(StringAsPath imported, string abspath, string dirname, string basename |
+    exists(FilePath imported, string abspath, string dirname, string basename |
       this.targetCandidate(result, abspath, imported, dirname, basename)
     |
       abspath.regexpMatch(".*/\\Q" + imported + "\\E")
@@ -304,7 +304,7 @@ private class AmdDependencyImport extends Import {
    * `dirname` and `basename` to the dirname and basename (respectively) of `imported`.
    */
   private predicate targetCandidate(
-    File f, string abspath, StringAsPath imported, string dirname, string basename
+    File f, string abspath, FilePath imported, string dirname, string basename
   ) {
     imported = this.getImportedPathString() and
     f.getStem() = imported.getStem() and

javascript/ql/lib/semmle/javascript/Paths.qll

@@ -96,11 +96,11 @@ deprecated private class ConsPath extends Path, TConsPath {
 private string pathRegex() { result = "(.*)(?:/|^)(([^/]*?)(\\.([^.]*))?)" }
 
 /**
- * Providers helper predicates for extracting parts of a path string.
+ * A `string` with some additional member predicates for extracting parts of a path string.
  */
-class StringAsPath extends string {
+class FilePath extends string {
   bindingset[this]
-  StringAsPath() { any() }
+  FilePath() { any() }
 
   /** Gets the `i`th component of this path. */
   bindingset[this]
@@ -136,11 +136,15 @@ class StringAsPath extends string {
   string getExtension() { result = this.regexpCapture(pathRegex(), 4) }
 
   /**
-   * Holds if this path is relative, in the sense that it should be resolved relative to its enclosing folder.
+   * Holds if this is a relative path starting with an explicit `./` or similar syntax meaning it
+   * must be resolved relative to its enclosing folder.
+   *
+   * Specifically this holds when the string is `.` or `..`, or starts with `./` or `../` or
+   * `.\` or `..\`.
    */
   bindingset[this]
   pragma[inline_late]
-  predicate isRelativePath() { this.regexpMatch("\\.\\.?(?:[/\\\\].*)?") }
+  predicate isDotRelativePath() { this.regexpMatch("\\.\\.?(?:[/\\\\].*)?") }
 
   /**
    * Gets the NPM package name from the beginning of the given import path, e.g.
@@ -160,7 +164,7 @@ class StringAsPath extends string {
  * usually resolved relative to the module's folder, with a default
  * lookup path as the fallback.
  */
-abstract deprecated class PathString extends StringAsPath {
+abstract deprecated class PathString extends FilePath {
   bindingset[this]
   PathString() { any() }
 

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

@@ -152,8 +152,8 @@ class ExternalNpmDependency extends NpmDependency {
 }
 
 pragma[nomagic]
-private string getImportedPackage(Import i) {
-  result = i.getImportedPathString().(StringAsPath).getPackagePrefix()
+private string getPackagePrefix(Import i) {
+  result = i.getImportedPathString().(FilePath).getPackagePrefix()
 }
 
 /**
@@ -164,7 +164,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
-    name = getImportedPackage(i) and
+    name = getPackagePrefix(i) and
     i.getEnclosingModule() = pkg.getAModule() and
     result = distance(pkg, i.getFile())
   )

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

@@ -94,7 +94,7 @@ module ResolveExpr<exprSig/1 shouldResolveExpr> {
    */
   pragma[nomagic]
   private string getPackagePrefixFromPathExpr(RelevantExpr expr) {
-    result = expr.getValue().(StringAsPath).getPackagePrefix()
+    result = expr.getValue().(FilePath).getPackagePrefix()
   }
 
   /**
@@ -141,10 +141,10 @@ module ResolveExpr<exprSig/1 shouldResolveExpr> {
   }
 
   pragma[noopt]
-  private predicate relativePathExpr(RelevantExpr expr, Container base, StringAsPath path) {
+  private predicate relativePathExpr(RelevantExpr expr, Container base, FilePath path) {
     expr instanceof RelevantExpr and
     path = expr.getValue() and
-    path.isRelativePath() and
+    path.isDotRelativePath() and
     exists(File file |
       file = expr.getFile() and
       base = file.getParentContainer()
@@ -164,15 +164,15 @@ module ResolveExpr<exprSig/1 shouldResolveExpr> {
    * Holds if `expr` should be resolved as `path` relative to `base`.
    */
   pragma[nomagic]
-  private predicate shouldResolve(RelevantExpr expr, Container base, StringAsPath path) {
+  private predicate shouldResolve(RelevantExpr expr, Container base, FilePath path) {
     // Relative paths are resolved from their enclosing folder
     relativePathExpr(expr, base, path)
     or
     resolveViaPathMapping(expr, base, path)
     or
     // Resolve from baseUrl of relevant tsconfig.json file
     path = expr.getValue() and
-    not path.isRelativePath() and
+    not path.isDotRelativePath() and
     getAPathMappingFromPathExpr(expr).hasBaseUrl(base)
     or
     // If the path starts with the name of a package, but did not match any path mapping,