renamings - and simplifications of qldoc

Author: erik-krogh

javascript/ql/src/javascript.qll

@@ -25,7 +25,6 @@ import semmle.javascript.Errors
 import semmle.javascript.ES2015Modules
 import semmle.javascript.Expr
 import semmle.javascript.Extend
-import semmle.javascript.ExtendedStaging
 import semmle.javascript.Externs
 import semmle.javascript.Files
 import semmle.javascript.Functions
@@ -34,6 +33,7 @@ import semmle.javascript.GlobalAccessPaths
 import semmle.javascript.HTML
 import semmle.javascript.HtmlSanitizers
 import semmle.javascript.InclusionTests
+import semmle.javascript.internal.CachedStages
 import semmle.javascript.JSDoc
 import semmle.javascript.JSON
 import semmle.javascript.JsonParsers

javascript/ql/src/semmle/javascript/AMD.qll

@@ -299,7 +299,7 @@ private class AmdDependencyImport extends Import {
 class AmdModule extends Module {
   cached
   AmdModule() {
-    ExtendedStaging::DataFlowStage::ref() and
+    Stages::DataFlowStage::ref() and
     exists(unique(AmdModuleDefinition def | amdModuleTopLevel(def, this)))
   }
 

javascript/ql/src/semmle/javascript/AST.qll

@@ -75,7 +75,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the toplevel syntactic unit to which this element belongs. */
   cached
-  TopLevel getTopLevel() { ExtendedStaging::Ast::ref() and result = getParent().getTopLevel() }
+  TopLevel getTopLevel() { Stages::Ast::ref() and result = getParent().getTopLevel() }
 
   /**
    * Gets the `i`th child node of this node.
@@ -119,7 +119,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the parent node of this node, if any. */
   cached
-  ASTNode getParent() { ExtendedStaging::Ast::ref() and this = result.getAChild() }
+  ASTNode getParent() { Stages::Ast::ref() and this = result.getAChild() }
 
   /** Gets the first control flow node belonging to this syntactic entity. */
   ControlFlowNode getFirstControlFlowNode() { result = this }
@@ -135,7 +135,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
    */
   cached
   private predicate isAmbientInternal() {
-    ExtendedStaging::Ast::ref() and
+    Stages::Ast::ref() and
     getParent().isAmbientInternal()
     or
     not isAmbientTopLevel(getTopLevel()) and
@@ -188,7 +188,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
  */
 cached
 private predicate isAmbientTopLevel(TopLevel tl) {
-  ExtendedStaging::Ast::ref() and tl.getFile().getBaseName().matches("%.d.ts")
+  Stages::Ast::ref() and tl.getFile().getBaseName().matches("%.d.ts")
 }
 
 /**

javascript/ql/src/semmle/javascript/BasicBlocks.qll

@@ -60,7 +60,7 @@ private module Internal {
 
   cached
   predicate useAt(BasicBlock bb, int i, Variable v, VarUse u) {
-    ExtendedStaging::BasicBlocks::ref() and
+    Stages::BasicBlocks::ref() and
     v = u.getVariable() and
     bbIndex(bb, u, i)
   }

javascript/ql/src/semmle/javascript/Expr.qll

@@ -109,7 +109,7 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
 
   /** Gets the constant string value this expression evaluates to, if any. */
   cached
-  string getStringValue() { ExtendedStaging::Ast::ref() and result = getStringValue(this) }
+  string getStringValue() { Stages::Ast::ref() and result = getStringValue(this) }
 
   /** Holds if this expression is impure, that is, its evaluation could have side effects. */
   predicate isImpure() { any() }
@@ -257,7 +257,7 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
 
 cached
 private DataFlow::Node getCatchParameterFromStmt(Stmt stmt) {
-  ExtendedStaging::DataFlowStage::ref() and
+  Stages::DataFlowStage::ref() and
   result =
     DataFlow::parameterNode(stmt.getEnclosingTryCatchStmt().getACatchClause().getAParameter())
 }
@@ -808,7 +808,7 @@ class FunctionExpr extends @function_expr, Expr, Function {
   override Stmt getEnclosingStmt() { result = Expr.super.getEnclosingStmt() }
 
   override StmtContainer getEnclosingContainer() {
-    ExtendedStaging::Ast::ref() and result = Expr.super.getContainer()
+    Stages::Ast::ref() and result = Expr.super.getContainer()
   }
 
   override predicate isImpure() { none() }

javascript/ql/src/semmle/javascript/GlobalAccessPaths.qll

@@ -539,7 +539,7 @@ module AccessPath {
      */
     cached
     predicate hasDominatingWrite(DataFlow::PropRead read) {
-      ExtendedStaging::FlowSteps::ref() and
+      Stages::FlowSteps::ref() and
       // within the same basic block.
       exists(ReachableBasicBlock bb, Root root, string path, int ranking |
         read.asExpr() = rankedAccessPath(bb, root, path, ranking, AccessPathRead()) and

javascript/ql/src/semmle/javascript/JSDoc.qll

@@ -58,7 +58,7 @@ abstract class Documentable extends ASTNode {
   /** Gets the JSDoc comment for this element, if any. */
   cached
   JSDoc getDocumentation() {
-    ExtendedStaging::Ast::ref() and result.getComment().getNextToken() = getFirstToken()
+    Stages::Ast::ref() and result.getComment().getNextToken() = getFirstToken()
   }
 }
 

javascript/ql/src/semmle/javascript/Modules.qll

@@ -239,7 +239,7 @@ abstract class Import extends ASTNode {
    */
   cached
   Module getImportedModule() {
-    ExtendedStaging::Imports::ref() and
+    Stages::Imports::ref() and
     if exists(resolveExternsImport())
     then result = resolveExternsImport()
     else (

javascript/ql/src/semmle/javascript/SSA.qll

@@ -354,7 +354,7 @@ private module Internal {
    */
   cached
   SsaDefinition getDefReachingEndOf(ReachableBasicBlock bb, SsaSourceVariable v) {
-    ExtendedStaging::DataFlowStage::ref() and
+    Stages::DataFlowStage::ref() and
     exists(int lastRef | lastRef = max(int i | ssaRef(bb, i, v, _)) |
       result = getLocalDefinition(bb, lastRef, v)
       or

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

@@ -733,7 +733,7 @@ private class FlowStepThroughImport extends AdditionalFlowStep, DataFlow::ValueN
   override ImportSpecifier astNode;
 
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-    ExtendedStaging::FlowSteps::ref() and
+    Stages::FlowSteps::ref() and
     pred = this and
     succ = DataFlow::ssaDefinitionNode(SSA::definition(astNode))
   }