feat: Update to remove unneeded AST classes + update CFG

Author: GeekMasher

ql/lib/codeql/bicep/ast/Expr.qll

@@ -9,13 +9,11 @@ private import internal.Expr
 private import internal.Arguments
 private import internal.AssignmentExpression
 private import internal.BinaryExpression
-private import internal.Expression
 private import internal.Interpolation
 private import internal.LambdaExpression
 private import internal.MemberExpression
 private import internal.NullableType
 private import internal.ParenthesizedExpression
-private import internal.PrimaryExpression
 private import internal.ResourceExpression
 private import internal.TernaryExpression
 private import internal.UnaryExpression
@@ -112,15 +110,6 @@ class BinaryExpression extends Expr instanceof BinaryExpressionImpl {
   string getOperator() { result = BinaryExpressionImpl.super.getOperator() }
 }
 
-/**
- * A generic expression in the AST.
- * 
- * This class represents any expression that doesn't fit into other more 
- * specific expression categories. It serves as a base implementation for 
- * expressions in the Bicep language.
- */
-class Expression extends Expr instanceof ExpressionImpl { }
-
 /**
  * An interpolation expression in the AST.
  * 
@@ -237,15 +226,6 @@ class ParenthesizedExpression extends Expr instanceof ParenthesizedExpressionImp
   }
 }
 
-/**
- * A primary expression in the AST.
- * 
- * Represents a basic, self-contained expression such as a literal value,
- * identifier, or other fundamental expression type. Primary expressions
- * serve as the building blocks for more complex expressions.
- */
-class PrimaryExpression extends Expr instanceof PrimaryExpressionImpl { }
-
 /**
  * A resource expression in the AST.
  * 

ql/lib/codeql/bicep/ast/Misc.qll

@@ -3,7 +3,6 @@ private import internal.Array
 private import internal.ArrayType
 private import internal.Boolean
 private import internal.CompatibleIdentifier
-private import internal.Declaration
 private import internal.Decorator
 private import internal.Decorators
 private import internal.DiagnosticComment
@@ -38,11 +37,6 @@ class ArrayType extends AstNode instanceof ArrayTypeImpl { }
  */
 class CompatibleIdentifier extends AstNode instanceof CompatibleIdentifierImpl { }
 
-/**
- *  A Declaration unknown AST node.
- */
-class Declaration extends AstNode instanceof DeclarationImpl { }
-
 /**
  *  A Decorator unknown AST node.
  */

ql/lib/codeql/bicep/ast/Stmts.qll

@@ -5,6 +5,7 @@
 private import AstNodes
 private import Idents
 private import Expr
+private import Calls
 private import Misc
 private import internal.AstNodes
 private import internal.TreeSitter
@@ -15,7 +16,6 @@ private import internal.IfStatement
 private import internal.ImportStatement
 private import internal.ImportWithStatement
 private import internal.Infrastructure
-private import internal.Statement
 private import internal.UsingStatement
 private import internal.Parameter
 private import internal.Parameters
@@ -55,6 +55,47 @@ class Stmts extends AstNode instanceof StmtsImpl {
   AstNode getAControlFlowEntryNode() { result = CfgImpl::getAControlFlowEntryNode(this) }
 }
 
+/**
+ * A sequence of statements in the PHP AST.
+ *
+ * This represents a list of statements that appear together in sequence.
+ */
+class StmtSequence extends AstNode instanceof StmtSequenceImpl {
+  /**
+   * Gets all statements in this sequence.
+   */
+  Stmts getStmts() { none() }
+
+  /**
+   * Gets the statement at the specified index within this sequence.
+   */
+  Stmts getStmt(int index) { none() }
+
+  /**
+   * Get all callables defined in this program.
+   */
+  Callable getCallables() {
+    result = this.getStmts()
+  }
+
+  /**
+   * Get a callable by its name.
+   */
+  Callable getCallable(string name) {
+    exists(Callable c | c = this.getCallables() and c.getName() = name | result = c)
+  }
+
+  /**
+   * Gets the number of statements in this sequence.
+   */
+  int getNumberOfStatements() { result = count(int i | exists(this.getStmt(i))) }
+
+  /**
+   * Gets the last statement of the sequence
+   */
+  Stmts getLastStmt() { result = this.getStmt(this.getNumberOfStatements() - 1) }
+}
+
 /**
  * An assert statement in the AST.
  * 
@@ -118,14 +159,10 @@ final class ImportStatementStmt extends Stmts instanceof ImportStatementImpl { }
  * statements and declarations that define the infrastructure to be deployed.
  * This is essentially the entry point of a Bicep program.
  */
-class Infrastructure extends AstNode instanceof InfrastructureImpl {
-  /** 
-   * Gets the statement at the specified index in the infrastructure.
-   * 
-   * @param index The index of the statement to retrieve
-   * @return The statement at the specified index
-   */
-  Stmts getStatement(int index) { result = InfrastructureImpl.super.getStatement(index) }
+class Infrastructure extends StmtSequence instanceof InfrastructureImpl {
+  override Stmts getStmts() { result = InfrastructureImpl.super.getStmts() }
+
+  override Stmts getStmt(int index) { result = InfrastructureImpl.super.getStmt(index) }
 }
 
 /**
@@ -360,15 +397,6 @@ class Parameters extends AstNode instanceof ParametersImpl {
  */
 final class ImportWithStatementStmt extends Stmts instanceof ImportWithStatementImpl { }
 
-/**
- * A generic statement in the AST.
- * 
- * This class represents any statement that doesn't fit into other more specific
- * statement categories. It serves as a base implementation for statements
- * in the Bicep language.
- */
-final class StatementStmt extends Stmts instanceof StatementImpl { }
-
 /**
  * A using statement in the AST.
  * 

ql/lib/codeql/bicep/ast/internal/CallExpression.qll

@@ -8,7 +8,6 @@ private import TreeSitter
 private import codeql.bicep.ast.AstNodes
 private import Expr
 private import Calls
-private import Expression
 private import Idents
 private import Arguments
 private import NullableReturnType

ql/lib/codeql/bicep/ast/internal/Declaration.qll

@@ -8,7 +8,6 @@ private import AstNodes
 private import TreeSitter
 private import codeql.bicep.ast.AstNodes
 private import Stmts
-private import Statement
 
 /**
  *  A Infrastructure AST Node.
@@ -22,9 +21,7 @@ class InfrastructureImpl extends TInfrastructure, StmtSequenceImpl {
 
   override string toString() { result = ast.toString() }
 
-  override StmtsImpl getStmt(int index) { result = this.getStatement(index) }
+  override StmtsImpl getStmt(int index) { toTreeSitter(result) = ast.getChild(index) }
 
-  override StmtsImpl getStmts() { result = this.getStatement(_) }
-
-  StatementImpl getStatement(int index) { toTreeSitter(result) = ast.getChild(index) }
+  override StmtsImpl getStmts() { result = this.getStmt(_) }
 }

ql/lib/codeql/bicep/ast/internal/Expression.qll

@@ -64,7 +64,7 @@ private module CfgImpl = Make<Location, Implementation>;
 import CfgImpl
 
 class InfrastructureScopeTree extends StandardTree, PreOrderTree, PostOrderTree, Scope::InfrastructureScope {
-  override AstNode getChildNode(int i) { result = super.getStatement(i) }
+  override AstNode getChildNode(int i) { result = super.getStmt(i) }
 }
 
 class StmtsTree extends StandardPostOrderTree instanceof Stmts {