JS: Allow isTypeUsed overrides to be global

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

@@ -111,9 +111,14 @@ private module Cached {
       none() and
       // We want to prune irrelevant models before materialising data flow nodes, so types contributed
       // directly from CodeQL must expose their pruning info without depending on data flow nodes.
-      (any(ModelInput::TypeModel tm).isTypeUsed("") implies any())
+      (isTypeUsedLocal() implies any())
     }
 
+  overlay[global]
+  private predicate isTypeUsedGlobal() { any(ModelInput::TypeModel tm).isTypeUsed("") }
+
+  private predicate isTypeUsedLocal() = forceLocal(isTypeUsedGlobal/0)()
+
   cached
   private module Backref {
     cached

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

@@ -393,20 +393,31 @@ predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
   )
 }
 
+pragma[nomagic]
+private predicate isTypeMentionedInModel(string type) {
+  sourceModel(type, _, _, _) or
+  sinkModel(type, _, _, _) or
+  summaryModel(type, _, _, _, _, _) or
+  typeModel(_, type, _)
+}
+
+overlay[global]
+private predicate isTypeUsedGlobal(string type) {
+  isTypeMentionedInModel(type) and any(TypeModel tm).isTypeUsed(type)
+}
+
+overlay[local]
+private predicate isTypeUsedLocal(string type) = forceLocal(isTypeUsedGlobal/1)(type)
+
 /**
  * Holds if rows involving `type` might be relevant for the analysis of this database.
  */
 predicate isRelevantType(string type) {
-  (
-    sourceModel(type, _, _, _) or
-    sinkModel(type, _, _, _) or
-    summaryModel(type, _, _, _, _, _) or
-    typeModel(_, type, _)
-  ) and
+  isTypeMentionedInModel(type) and
   (
     Specific::isTypeUsed(type)
     or
-    any(TypeModel model).isTypeUsed(type)
+    isTypeUsedLocal(type)
     or
     exists(TestAllModels t)
   )

javascript/ql/test/library-tests/frameworks/data/test.ql

@@ -2,7 +2,6 @@ import javascript
 deprecated import utils.test.ConsistencyChecking
 import semmle.javascript.frameworks.data.internal.ApiGraphModels as ApiGraphModels
 
-overlay[local]
 class TypeModelFromCodeQL extends ModelInput::TypeModel {
   override predicate isTypeUsed(string type) { type = "danger-constant" }
 

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

@@ -393,20 +393,31 @@ predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
   )
 }
 
+pragma[nomagic]
+private predicate isTypeMentionedInModel(string type) {
+  sourceModel(type, _, _, _) or
+  sinkModel(type, _, _, _) or
+  summaryModel(type, _, _, _, _, _) or
+  typeModel(_, type, _)
+}
+
+overlay[global]
+private predicate isTypeUsedGlobal(string type) {
+  isTypeMentionedInModel(type) and any(TypeModel tm).isTypeUsed(type)
+}
+
+overlay[local]
+private predicate isTypeUsedLocal(string type) = forceLocal(isTypeUsedGlobal/1)(type)
+
 /**
  * Holds if rows involving `type` might be relevant for the analysis of this database.
  */
 predicate isRelevantType(string type) {
-  (
-    sourceModel(type, _, _, _) or
-    sinkModel(type, _, _, _) or
-    summaryModel(type, _, _, _, _, _) or
-    typeModel(_, type, _)
-  ) and
+  isTypeMentionedInModel(type) and
   (
     Specific::isTypeUsed(type)
     or
-    any(TypeModel model).isTypeUsed(type)
+    isTypeUsedLocal(type)
     or
     exists(TestAllModels t)
   )

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

@@ -393,20 +393,31 @@ predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
   )
 }
 
+pragma[nomagic]
+private predicate isTypeMentionedInModel(string type) {
+  sourceModel(type, _, _, _) or
+  sinkModel(type, _, _, _) or
+  summaryModel(type, _, _, _, _, _) or
+  typeModel(_, type, _)
+}
+
+overlay[global]
+private predicate isTypeUsedGlobal(string type) {
+  isTypeMentionedInModel(type) and any(TypeModel tm).isTypeUsed(type)
+}
+
+overlay[local]
+private predicate isTypeUsedLocal(string type) = forceLocal(isTypeUsedGlobal/1)(type)
+
 /**
  * Holds if rows involving `type` might be relevant for the analysis of this database.
  */
 predicate isRelevantType(string type) {
-  (
-    sourceModel(type, _, _, _) or
-    sinkModel(type, _, _, _) or
-    summaryModel(type, _, _, _, _, _) or
-    typeModel(_, type, _)
-  ) and
+  isTypeMentionedInModel(type) and
   (
     Specific::isTypeUsed(type)
     or
-    any(TypeModel model).isTypeUsed(type)
+    isTypeUsedLocal(type)
     or
     exists(TestAllModels t)
   )