JS: autoformat

javascript/ql/src/semmle/javascript/Closure.qll

@@ -5,7 +5,6 @@
 import javascript
 
 module Closure {
-  
   /**
    * A call to a function in the `goog` namespace such as `goog.provide` or `goog.load`.
    */
@@ -15,64 +14,60 @@ module Closure {
         this.getCallee().(DotExpr).getBase() = gv.getAnAccess()
       )
     }
-  
+
     /** Gets the name of the invoked function. */
     string getFunctionName() { result = getCallee().(DotExpr).getPropertyName() }
   }
-  
+
   /**
    * An expression statement consisting of a call to a function
    * in the `goog` namespace.
    */
   class GoogFunctionCallStmt extends ExprStmt {
     GoogFunctionCallStmt() { super.getExpr() instanceof GoogFunctionCall }
-  
+
     override GoogFunctionCall getExpr() { result = super.getExpr() }
-  
+
     /** Gets the name of the invoked function. */
     string getFunctionName() { result = getExpr().getFunctionName() }
-  
+
     /** Gets the `i`th argument to the invoked function. */
     Expr getArgument(int i) { result = getExpr().getArgument(i) }
-  
+
     /** Gets an argument to the invoked function. */
     Expr getAnArgument() { result = getArgument(_) }
   }
-  
-  private abstract class GoogNamespaceRef extends ExprOrStmt {
-    abstract string getNamespaceId();
-  }
-  
+
+  abstract private class GoogNamespaceRef extends ExprOrStmt { abstract string getNamespaceId(); }
+
   /**
    * A call to `goog.provide`.
    */
   class GoogProvide extends GoogFunctionCallStmt, GoogNamespaceRef {
     GoogProvide() { getFunctionName() = "provide" }
-  
+
     /** Gets the identifier of the namespace created by this call. */
     override string getNamespaceId() { result = getArgument(0).getStringValue() }
   }
-  
+
   /**
    * A call to `goog.require`.
    */
   class GoogRequire extends GoogFunctionCall, GoogNamespaceRef {
     GoogRequire() { getFunctionName() = "require" }
-  
+
     /** Gets the identifier of the namespace imported by this call. */
     override string getNamespaceId() { result = getArgument(0).getStringValue() }
   }
-  
+
   private class GoogRequireImport extends GoogRequire, Import {
     /** Gets the module in which this import appears. */
     override Module getEnclosingModule() { result = getTopLevel() }
-  
+
     /** Gets the (unresolved) path that this import refers to. */
-    override PathExpr getImportedPath() {
-      result = getArgument(0)
-    }
+    override PathExpr getImportedPath() { result = getArgument(0) }
   }
-  
+
   /**
    * A call to `goog.module` or `goog.declareModuleId`.
    */
@@ -81,38 +76,34 @@ module Closure {
       getFunctionName() = "module" or
       getFunctionName() = "declareModuleId"
     }
-  
+
     /** Gets the identifier of the namespace imported by this call. */
     override string getNamespaceId() { result = getArgument(0).getStringValue() }
   }
-  
+
   /**
    * A module using the Closure module system, declared using `goog.module()` or `goog.declareModuleId()`.
    */
   class ClosureModule extends Module {
-    ClosureModule() {
-      getAChildStmt() instanceof GoogModuleDeclaration
-    }
-  
+    ClosureModule() { getAChildStmt() instanceof GoogModuleDeclaration }
+
     /**
      * Gets the call to `goog.module` or `goog.declareModuleId` in this module.
      */
-    GoogModuleDeclaration getModuleDeclaration() {
-      result = getAChildStmt()
-    }
-  
+    GoogModuleDeclaration getModuleDeclaration() { result = getAChildStmt() }
+
     /**
      * Gets the namespace of this module.
      */
     string getNamespaceId() { result = getModuleDeclaration().getNamespaceId() }
-  
+
     override Module getAnImportedModule() {
-      exists (GoogRequireImport imprt | 
+      exists(GoogRequireImport imprt |
         imprt.getEnclosingModule() = this and
         result.(ClosureModule).getNamespaceId() = imprt.getNamespaceId()
       )
     }
-  
+
     /**
      * Gets the top-level `exports` variable in this module, if this module is defined by
      * a `good.module` call.
@@ -125,19 +116,19 @@ module Closure {
       getModuleDeclaration().getFunctionName() = "module" and
       result = getScope().getVariable("exports")
     }
-  
+
     override predicate exports(string name, ASTNode export) {
       // exports.foo = bar
       export.(AssignExpr).getLhs().(PropAccess).accesses(getExportsVariable().getAnAccess(), name)
       or
       // exports = { foo: bar }
-      exists (VarDef def |
+      exists(VarDef def |
         def.getTarget() = getExportsVariable().getAReference() and
         def.getSource().(ObjectExpr).getPropertyByName(name) = export
       )
     }
   }
-  
+
   /**
    * A global Closure script, that is, a toplevel that is executed in the global scope and
    * contains a toplevel call to `goog.provide` or `goog.require`.
@@ -145,29 +136,32 @@ module Closure {
   class ClosureScript extends TopLevel {
     ClosureScript() {
       not this instanceof ClosureModule and
-      getAChildStmt() instanceof GoogProvide or
+      getAChildStmt() instanceof GoogProvide
+      or
       getAChildStmt().(ExprStmt).getExpr() instanceof GoogRequire
     }
-  
+
     /** Gets the identifier of a namespace required by this module. */
-    string getARequiredNamespace() { result = getAChildStmt().(ExprStmt).getExpr().(GoogRequire).getNamespaceId() }
-  
+    string getARequiredNamespace() {
+      result = getAChildStmt().(ExprStmt).getExpr().(GoogRequire).getNamespaceId()
+    }
+
     /** Gets the identifer of a namespace provided by this module. */
     string getAProvidedNamespace() { result = getAChildStmt().(GoogProvide).getNamespaceId() }
   }
-  
+
   /**
    * Holds if `name` is a closure namespace, including proper namespace prefixes.
    */
   pragma[noinline]
   predicate isLibraryNamespacePath(string name) {
-    exists (string namespace | namespace = any(GoogNamespaceRef provide).getNamespaceId() |
+    exists(string namespace | namespace = any(GoogNamespaceRef provide).getNamespaceId() |
       name = namespace.substring(0, namespace.indexOf("."))
       or
       name = namespace
     )
   }
-  
+
   /**
    * Gets the closure namespace path addressed by the given dataflow node, if any.
    */
@@ -176,21 +170,21 @@ module Closure {
     node = DataFlow::globalVarRef(result)
     or
     isLibraryNamespacePath(result) and
-    exists (DataFlow::PropRead read | node = read |
+    exists(DataFlow::PropRead read | node = read |
       result = getLibraryAccessPath(read.getBase().getALocalSource()) + "." + read.getPropertyName()
     )
     or
     // Associate an access path with the immediate RHS of a store on a closure namespace.
     // This is to support patterns like:
     // foo.bar = { baz() {} }
-    exists (DataFlow::PropWrite write |
+    exists(DataFlow::PropWrite write |
       node = write.getRhs() and
       result = getWrittenLibraryAccessPath(write)
     )
     or
     result = node.asExpr().(GoogRequire).getNamespaceId()
   }
-  
+
   /**
    * Gets the closure namespace path written to by the given property write, if any.
    */

javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll

@@ -1039,10 +1039,7 @@ module DataFlow {
     or
     exists(GlobalVarAccess va |
       nd = valueNode(va.(VarUse)) and
-      if Closure::isLibraryNamespacePath(va.getName()) then
-        cause = "heap"
-      else
-        cause = "global"
+      if Closure::isLibraryNamespacePath(va.getName()) then cause = "heap" else cause = "global"
     )
     or
     exists(Expr e | e = nd.asExpr() and cause = "call" |

javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll

@@ -338,11 +338,10 @@ private class AnalyzedExportAssign extends AnalyzedPropertyWrite, DataFlow::Valu
  */
 private class AnalyzedClosureExportAssign extends AnalyzedPropertyWrite, DataFlow::ValueNode {
   override AssignExpr astNode;
+
   Closure::ClosureModule mod;
 
-  AnalyzedClosureExportAssign() {
-    astNode.getLhs() = mod.getExportsVariable().getAReference()
-  }
+  AnalyzedClosureExportAssign() { astNode.getLhs() = mod.getExportsVariable().getAReference() }
 
   override predicate writes(AbstractValue baseVal, string propName, DataFlow::AnalyzedNode source) {
     baseVal = TAbstractModuleObject(astNode.getTopLevel()) and
@@ -359,12 +358,10 @@ private class AnalyzedClosureExportAssign extends AnalyzedPropertyWrite, DataFlo
 private class AnalyzedClosureGlobalAccessPath extends AnalyzedNode, AnalyzedPropertyRead {
   string accessPath;
 
-  AnalyzedClosureGlobalAccessPath() {
-    accessPath = Closure::getLibraryAccessPath(this)
-  }
+  AnalyzedClosureGlobalAccessPath() { accessPath = Closure::getLibraryAccessPath(this) }
 
   override AnalyzedNode localFlowPred() {
-    exists (DataFlow::PropWrite write |
+    exists(DataFlow::PropWrite write |
       Closure::getWrittenLibraryAccessPath(write) = accessPath and
       result = write.getRhs()
     )
@@ -373,10 +370,10 @@ private class AnalyzedClosureGlobalAccessPath extends AnalyzedNode, AnalyzedProp
   }
 
   override predicate reads(AbstractValue base, string propName) {
-    exists (Closure::ClosureModule mod |
+    exists(Closure::ClosureModule mod |
       mod.getNamespaceId() = accessPath and
       base = TAbstractModuleObject(mod) and
       propName = "exports"
     )
-  }  
+  }
 }