JS: refactor getADependency to return a string

Author: Napalys

javascript/ql/lib/semmle/javascript/NPM.qll

@@ -158,7 +158,7 @@ class PackageJson extends JsonObject {
    * different from the other dependency types.
    */
   predicate declaresDependency(string pkg, string version) {
-    this.getADependenciesObject(_).getADependency(pkg, version)
+    this.getADependenciesObject(_).getADependency(pkg) = version
   }
 
   /** Gets the engine dependencies of this package. */
@@ -340,8 +340,8 @@ class PackageDependencies extends JsonObject {
     )
   }
 
-  /** Holds if this package depends on version 'version' of package 'pkg'. */
-  predicate getADependency(string pkg, string version) { version = this.getPropStringValue(pkg) }
+  /** Returns the version of the specified package that this package depends on. */
+  string getADependency(string pkg) { result = this.getPropStringValue(pkg) }
 }
 
 /**

javascript/ql/lib/semmle/javascript/frameworks/Next.qll

@@ -11,7 +11,7 @@ module NextJS {
   /**
    * Gets a `package.json` that depends on the `Next.js` library.
    */
-  PackageJson getANextPackage() { result.getDependencies().getADependency("next", _) }
+  PackageJson getANextPackage() { exists(result.getDependencies().getADependency("next")) }
 
   /**
    * Gets a "pages" folder in a `Next.js` application.

javascript/ql/lib/semmle/javascript/frameworks/Redux.qll

@@ -24,7 +24,7 @@ module Redux {
     }
 
     private predicate packageDependsOn(PackageJson importer, PackageJson dependency) {
-      importer.getADependenciesObject("").getADependency(dependency.getPackageName(), _)
+      exists(importer.getADependenciesObject("").getADependency(dependency.getPackageName()))
     }
 
     /** Gets a package that can be considered an entry point for a Redux app. */

javascript/ql/lib/semmle/javascript/frameworks/Templating.qll

@@ -601,7 +601,7 @@ module Templating {
 
   private TemplateSyntax getOwnTemplateSyntaxInFolder(Folder f) {
     exists(PackageDependencies deps |
-      deps.getADependency(result.getAPackageName(), _) and
+      exists(deps.getADependency(result.getAPackageName())) and
       f = deps.getFile().getParentContainer()
     )
   }

javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll

@@ -374,7 +374,7 @@ module Vuex {
     }
 
     private predicate packageDependsOn(PackageJson importer, PackageJson dependency) {
-      importer.getADependenciesObject("").getADependency(dependency.getPackageName(), _)
+      exists(importer.getADependenciesObject("").getADependency(dependency.getPackageName()))
     }
 
     /** Gets a package that can be considered an entry point for a Vuex app. */

javascript/ql/src/NodeJS/UnresolvableImport.ql

@@ -39,7 +39,7 @@ where
     pkg.getAModule() = r.getTopLevel() and pkgJson = pkg.getPackageJson()
   |
     not pkgJson.declaresDependency(mod, _) and
-    not pkgJson.getPeerDependencies().getADependency(mod, _) and
+    not exists(pkgJson.getPeerDependencies().getADependency(mod)) and
     // exclude packages depending on `fbjs`, which automatically pulls in many otherwise
     // undeclared dependencies
     not pkgJson.declaresDependency("fbjs", _)

javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll

@@ -3,7 +3,7 @@ import javascript
 query predicate test_query19(PackageDependencies deps, string res) {
   exists(NpmPackage pkg, string name |
     deps = pkg.getPackageJson().getDependencies() and
-    deps.getADependency(name, _) and
+    exists(deps.getADependency(name)) and
     not exists(Require req | req.getTopLevel() = pkg.getAModule() |
       name = req.getImportedPath().getValue()
     )