Merge pull request #7678 from erik-krogh/use-set

JS: use more set literals

Author: erik-krogh

javascript/ql/lib/semmle/javascript/DOM.qll

@@ -176,18 +176,13 @@ module DOM {
       eltName = ["script", "iframe", "embed", "video", "audio", "source", "track"] and
       attrName = "src"
       or
-      (
-        eltName = "link" or
-        eltName = "a" or
-        eltName = "base" or
-        eltName = "area"
-      ) and
+      eltName = ["link", "a", "base", "area"] and
       attrName = "href"
       or
       eltName = "form" and
       attrName = "action"
       or
-      (eltName = "input" or eltName = "button") and
+      eltName = ["input", "button"] and
       attrName = "formaction"
     )
   }

javascript/ql/lib/semmle/javascript/Extend.qll

@@ -47,12 +47,7 @@ private DataFlow::SourceNode localDollar() {
  */
 private class ExtendCallWithFlag extends ExtendCall {
   ExtendCallWithFlag() {
-    exists(string name | this = DataFlow::moduleImport(name).getACall() |
-      name = "extend" or
-      name = "extend2" or
-      name = "just-extend" or
-      name = "node.extend"
-    )
+    this = DataFlow::moduleImport(["extend", "extend2", "just-extend", "node.extend"]).getACall()
     or
     this = localDollar().getAMemberCall("extend")
   }

javascript/ql/lib/semmle/javascript/Promises.qll

@@ -157,9 +157,7 @@ class ResolvedES2015PromiseDefinition extends ResolvedPromiseDefinition {
  */
 class AggregateES2015PromiseDefinition extends PromiseCreationCall {
   AggregateES2015PromiseDefinition() {
-    exists(string m | m = "all" or m = "race" or m = "any" or m = "allSettled" |
-      this = getAPromiseObject().getAMemberCall(m)
-    )
+    this = getAPromiseObject().getAMemberCall(["all", "race", "any", "allSettled"])
     or
     this = DataFlow::moduleImport("promise.allsettled").getACall()
   }
@@ -654,10 +652,7 @@ private module ClosurePromise {
         succ = call and
         pred = call.getAnArgument()
       |
-        name = "all" or
-        name = "allSettled" or
-        name = "firstFulfilled" or
-        name = "race"
+        name = ["all", "allSettled", "firstFulfilled", "race"]
       )
       or
       // promise created through goog.promise.withResolver()

javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll

@@ -694,15 +694,13 @@ module TaintTracking {
         )
         or
         // `(encode|decode)URI(Component)?` propagate taint
-        exists(DataFlow::CallNode c, string name |
+        exists(DataFlow::CallNode c |
           succ = c and
-          c = DataFlow::globalVarRef(name).getACall() and
+          c =
+            DataFlow::globalVarRef([
+                "encodeURI", "decodeURI", "encodeURIComponent", "decodeURIComponent"
+              ]).getACall() and
           pred = c.getArgument(0)
-        |
-          name = "encodeURI" or
-          name = "decodeURI" or
-          name = "encodeURIComponent" or
-          name = "decodeURIComponent"
         )
         or
         // In and out of .replace callbacks

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

@@ -64,10 +64,10 @@ module Cheerio {
       call = cheerioObjectRef().getAMethodCall(name) and
       result = call
     |
-      if name = "attr" or name = "data" or name = "prop" or name = "css"
+      if name = ["attr", "data", "prop", "css"]
       then call.getNumArgument() = 2
       else
-        if name = "val" or name = "html" or name = "text"
+        if name = ["val", "html", "text"]
         then call.getNumArgument() = 1
         else (
           name != "toString" and

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

@@ -17,10 +17,11 @@ module ConnectExpressShared {
    */
   private class RouteHandlerSignature extends string {
     RouteHandlerSignature() {
-      this = "request,response" or
-      this = "request,response,next" or
-      this = "request,response,next,parameter" or
-      this = "error,request,response,next"
+      this =
+        [
+          "request,response", "request,response,next", "request,response,next,parameter",
+          "error,request,response,next"
+        ]
     }
 
     /** Gets the index of the parameter corresonding to the given `kind`, if any. */

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

@@ -159,7 +159,7 @@ private module FStream {
         or
         readOrWrite = "Writer" and writer = true
       ) and
-      (subMod = "File" or subMod = "Dir" or subMod = "Link" or subMod = "Proxy")
+      subMod = ["File", "Dir", "Link", "Proxy"]
     |
       result = mod.getAPropertyRead(readOrWrite) or
       result = mod.getAPropertyRead(readOrWrite).getAPropertyRead(subMod) or

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

@@ -485,10 +485,7 @@ private module Mongoose {
        * Holds if Document method `name` returns a Document.
        */
       predicate returnsDocument(string name) {
-        name = "depopulate" or
-        name = "init" or
-        name = "populate" or
-        name = "overwrite"
+        name = ["depopulate", "init", "populate", "overwrite"]
       }
     }
   }

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

@@ -548,12 +548,7 @@ module NodeJSLib {
 
   /** A file system read. */
   private class NodeJSFileSystemAccessRead extends FileSystemReadAccess, NodeJSFileSystemAccess {
-    NodeJSFileSystemAccessRead() {
-      methodName = "read" or
-      methodName = "readSync" or
-      methodName = "readFile" or
-      methodName = "readFileSync"
-    }
+    NodeJSFileSystemAccessRead() { methodName = ["read", "readSync", "readFile", "readFileSync"] }
 
     override DataFlow::Node getADataNode() {
       if methodName.matches("%Sync")

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

@@ -55,20 +55,10 @@ module PkgCloud {
          */
 
         kind = "user name" and
-        (
-          propertyName = "account" or
-          propertyName = "keyId" or
-          propertyName = "storageAccount" or
-          propertyName = "username"
-        )
+        propertyName = ["account", "keyId", "storageAccount", "username"]
         or
         kind = "password" and
-        (
-          propertyName = "key" or
-          propertyName = "apiKey" or
-          propertyName = "storageAccessKey" or
-          propertyName = "password"
-        )
+        propertyName = ["key", "apiKey", "storageAccessKey", "password"]
         or
         kind = "token" and
         propertyName = "token"