JS: Refactor Test Cases - 'get' Predicates Without Return Values

Author: Napalys

javascript/ql/test/library-tests/ClassNode/tests.ql

@@ -4,12 +4,12 @@ query predicate fieldStep(DataFlow::Node pred, DataFlow::Node succ) {
   DataFlow::localFieldStep(pred, succ)
 }
 
-query predicate getAReceiverNode(DataFlow::ClassNode cls, DataFlow::SourceNode recv) {
-  cls.getAReceiverNode() = recv
+query DataFlow::SourceNode getAReceiverNode(DataFlow::ClassNode cls) {
+  result = cls.getAReceiverNode()
 }
 
-query predicate getFieldTypeAnnotation(DataFlow::ClassNode cls, string name, TypeAnnotation ann) {
-  ann = cls.getFieldTypeAnnotation(name)
+query TypeAnnotation getFieldTypeAnnotation(DataFlow::ClassNode cls, string name) {
+  result = cls.getFieldTypeAnnotation(name)
 }
 
 query predicate instanceMember(

javascript/ql/test/library-tests/Comprehensions/tests.ql

@@ -10,10 +10,8 @@ query predicate comprehensionExpr(ComprehensionExpr ce, int numBlock, int numFil
   body = ce.getBody()
 }
 
-query predicate getBlock(ComprehensionExpr ce, int i, ComprehensionBlock block) {
-  ce.getBlock(i) = block
-}
+query ComprehensionBlock getBlock(ComprehensionExpr ce, int i) { result = ce.getBlock(i) }
 
-query predicate getFilter(ComprehensionExpr ce, int i, Expr filter) { ce.getFilter(i) = filter }
+query Expr getFilter(ComprehensionExpr ce, int i) { result = ce.getFilter(i) }
 
 query predicate varDecls(VarAccess va, VarDecl decl) { decl = va.getVariable().getADeclaration() }

javascript/ql/test/library-tests/DataFlow/tests.ql

@@ -13,11 +13,11 @@ query predicate enclosingExpr(DataFlow::Node node, Expr enclosingExpr) {
 
 query predicate flowStep(DataFlow::Node pred, DataFlow::Node nd) { nd.getAPredecessor() = pred }
 
-query predicate getImmediatePredecessor(DataFlow::Node pred, DataFlow::Node nd) {
-  nd.getImmediatePredecessor() = pred
+query DataFlow::Node getImmediatePredecessor(DataFlow::Node pred) {
+  result.getImmediatePredecessor() = pred
 }
 
-query predicate getIntValue(DataFlow::Node node, int val) { node.getIntValue() = val }
+query int getIntValue(DataFlow::Node node) { result = node.getIntValue() }
 
 query predicate incomplete(DataFlow::Node dfn, DataFlow::Incompleteness cause) {
   dfn.isIncomplete(cause)

javascript/ql/test/library-tests/Flow/tests.ql

@@ -10,9 +10,7 @@ query predicate abseval(
 
 query predicate abstractValues(AbstractValue val) { any() }
 
-query predicate getAPrototype(AbstractValue av, DefiniteAbstractValue proto) {
-  av.getAPrototype() = proto
-}
+query DefiniteAbstractValue getAPrototype(AbstractValue av) { result = av.getAPrototype() }
 
 private import semmle.javascript.dataflow.Refinements
 

javascript/ql/test/library-tests/NPM/tests.ql

@@ -19,9 +19,9 @@ query predicate npm(PackageJson pkg, string name, string version) {
   version = pkg.getVersion()
 }
 
-query predicate getMainModule(PackageJson pkg, string name, Module mod) {
+query Module getMainModule(PackageJson pkg, string name) {
   name = pkg.getPackageName() and
-  mod = pkg.getMainModule()
+  result = pkg.getMainModule()
 }
 
 query predicate packageJson(PackageJson json) { any() }

javascript/ql/test/library-tests/TypeScript/Types/tests.ql

@@ -3,11 +3,11 @@ import javascript
 // Ensure `true | false` and `false | true` are not distinct boolean types.
 query predicate booleans(BooleanType t) { any() }
 
-query predicate getExprType(Expr expr, Type type) { type = expr.getType() }
+query Type getExprType(Expr expr) { result = expr.getType() }
 
-query predicate getTypeDefinitionType(TypeDefinition def, Type type) { type = def.getType() }
+query Type getTypeDefinitionType(TypeDefinition def) { result = def.getType() }
 
-query predicate getTypeExprType(TypeExpr e, Type type) { e.getType() = type }
+query Type getTypeExprType(TypeExpr e) { result = e.getType() }
 
 query predicate missingToString(Type typ, string msg) {
   not exists(typ.toString()) and

javascript/ql/test/library-tests/frameworks/Express/RouteHandlerContainer.qll

@@ -1,8 +1,7 @@
 import javascript
 
-query predicate getRouteHandlerContainerStep(
-  Http::RouteHandlerCandidateContainer container, DataFlow::SourceNode handler,
-  DataFlow::SourceNode access
+query DataFlow::SourceNode getRouteHandlerContainerStep(
+  Http::RouteHandlerCandidateContainer container, DataFlow::SourceNode handler
 ) {
-  handler = container.getRouteHandler(access)
+  handler = container.getRouteHandler(result)
 }

javascript/ql/test/library-tests/variables/tests.ql

@@ -4,11 +4,9 @@ query predicate capture(LocalVariable var, string name, VarDecl decl) {
   var.getADeclaration() = decl and name = var.getName()
 }
 
-query predicate getAnAssignedExpr(Variable v, Expr e) { e = v.getAnAssignedExpr() }
+query Expr getAnAssignedExpr(Variable v) { result = v.getAnAssignedExpr() }
 
-query predicate getDeclaringContainer(LocalVariable v, StmtContainer container) {
-  container = v.getDeclaringContainer()
-}
+query StmtContainer getDeclaringContainer(LocalVariable v) { result = v.getDeclaringContainer() }
 
 query predicate varBindings(VarAccess va, VarDecl decl) {
   decl = va.getVariable().getADeclaration()