JS: Sync ApiGraphModels.qll and update accordingly

Author: asgerf

javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModels.qll

@@ -436,26 +436,23 @@ module ModelOutput {
   }
 
   /**
-   * Holds if a relevant CSV summary row has the given `kind`, `input` and `output`.
+   * Holds if a relevant CSV summary exists for these parameters.
    */
-  predicate summaryModel(string input, string output, string kind) {
-    exists(string package |
-      isRelevantPackage(package) and
-      summaryModel(package, _, _, input, output, kind)
-    )
+  predicate relevantSummaryModel(
+    string package, string type, string path, string input, string output, string kind
+  ) {
+    isRelevantPackage(package) and
+    summaryModel(package, type, path, input, output, kind)
   }
 
   /**
-   * Holds if a summary edge with the given `input, output, kind` columns have a `package, type, path` tuple
-   * that resolves to `baseNode`.
+   * Holds if a `baseNode` is an invocation identified by the `package,type,path` part of a summary row.
    */
   predicate resolvedSummaryBase(
-    Specific::InvokeNode baseNode, AccessPath input, AccessPath output, string kind
+    string package, string type, string path, Specific::InvokeNode baseNode
   ) {
-    exists(string package, string type, AccessPath path |
-      summaryModel(package, type, path, input, output, kind) and
-      baseNode = getInvocationFromPath(package, type, path)
-    )
+    summaryModel(package, type, path, _, _, _) and
+    baseNode = getInvocationFromPath(package, type, path)
   }
 
   /**

javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll

@@ -148,10 +148,12 @@ predicate invocationMatchesExtraCallSiteFilter(API::InvokeNode invoke, AccessPat
  * Holds if `path` is an input or output spec for a summary with the given `base` node.
  */
 pragma[nomagic]
-private predicate relevantInputOutputPath(API::InvokeNode base, AccessPath path) {
-  ModelOutput::resolvedSummaryBase(base, path, _, _)
-  or
-  ModelOutput::resolvedSummaryBase(base, _, path, _)
+private predicate relevantInputOutputPath(API::InvokeNode base, AccessPath inputOrOutput) {
+  exists(string package, string type, string input, string output, string path |
+    ModelOutput::relevantSummaryModel(package, type, path, input, output, _) and
+    ModelOutput::resolvedSummaryBase(package, type, path, base) and
+    inputOrOutput = [input, output]
+  )
 }
 
 /**
@@ -179,8 +181,9 @@ private API::Node getNodeFromInputOutputPath(API::InvokeNode baseNode, AccessPat
  * Holds if a CSV summary contributed the step `pred -> succ` of the given `kind`.
  */
 predicate summaryStep(API::Node pred, API::Node succ, string kind) {
-  exists(API::InvokeNode base, AccessPath input, AccessPath output |
-    ModelOutput::resolvedSummaryBase(base, input, output, kind) and
+  exists(string package, string type, string path, API::InvokeNode base, AccessPath input, AccessPath output |
+    ModelOutput::relevantSummaryModel(package, type, path, input, output, kind) and
+    ModelOutput::resolvedSummaryBase(package, type, path, base) and
     pred = getNodeFromInputOutputPath(base, input) and
     succ = getNodeFromInputOutputPath(base, output)
   )