Ruby: introduce getExtraNodeFromType

Using getExtraNodeFromPath with n=0 was a bit of a hack. In principle, the CodeQL libraries might care about the type, even though there are no relevant paths starting at that type.

Author: asgerf

ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModels.qll

@@ -434,8 +434,7 @@ private API::Node getNodeFromType(string package, string type) {
   or
   result = any(TypeModelDefEntry e).getNodeForType(package, type)
   or
-  isRelevantFullPath(package, type, _) and
-  result = Specific::getExtraNodeFromPath(package, type, _, 0)
+  result = Specific::getExtraNodeFromType(package, type)
 }
 
 /**

ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsSpecific.qll

@@ -56,12 +56,6 @@ predicate isPackageUsed(string package) {
 /** Gets a Ruby-specific interpretation of the `(package, type, path)` tuple after resolving the first `n` access path tokens. */
 bindingset[package, type, path]
 API::Node getExtraNodeFromPath(string package, string type, AccessPath path, int n) {
-  isRelevantFullPath(package, type, path) and
-  exists(package) and // Allow any package name, see `isPackageUsed`.
-  type = "" and
-  n = 0 and
-  result = API::root()
-  or
   // A row of form `;any;Method[foo]` should match any method named `foo`.
   exists(package) and
   type = "any" and
@@ -72,6 +66,14 @@ API::Node getExtraNodeFromPath(string package, string type, AccessPath path, int
   )
 }
 
+/** Gets a Ruby-specific interpretation of the `(package, type)` tuple. */
+API::Node getExtraNodeFromType(string package, string type) {
+  isRelevantFullPath(package, type, _) and
+  exists(package) and // Allow any package name, see `isPackageUsed`.
+  type = "" and
+  result = API::root()
+}
+
 /**
  * Holds if `path` occurs in a CSV row with type `any`, meaning it can start
  * matching anywhere, and the path begins with `Method[methodName]`.