feat(ast): Update AST layer with small changes

Author: GeekMasher

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

@@ -1,12 +1,18 @@
 private import codeql.Locations
 private import codeql.files.FileSystem
+private import codeql.bicep.ast.internal.TreeSitter
 private import codeql.bicep.ast.internal.AstNodes
 private import codeql.bicep.ast.internal.TreeSitter
+private import codeql.bicep.controlflow.ControlFlowGraph
 
 /**
  * An AST node of a Bicep program
  */
 class AstNode extends TAstNode {
+  private BICEP::AstNode node;
+
+  AstNode() { toTreeSitter(this) = node }
+
   string toString() { result = this.getAPrimaryQlClass() }
 
   /** Gets the location of the AST node. */
@@ -39,17 +45,25 @@ class AstNode extends TAstNode {
    * Gets the parent in the AST for this node.
    */
   cached
-  AstNode getParent() { result.getAChild(_) = this }
+  AstNode getParent() { result.getAChild() = this }
 
   /**
    * Gets a child of this node, which can also be retrieved using a predicate
    * named `pred`.
    */
   cached
-  AstNode getAChild(string pred) { none() }
+  AstNode getAChild() { toTreeSitter(result) = node.getAFieldOrChild() }
 
-  /** Gets any child of this node. */
-  AstNode getAChild() { result = this.getAChild(_) }
+  /** Gets the CFG scope that encloses this node, if any. */
+  cached
+  CfgScope getEnclosingCfgScope() {
+    exists(AstNode p | p = this.getParent*() |
+      result = p
+      or
+      not p instanceof CfgScope and
+      result = p.getEnclosingCfgScope()
+    )
+  }
 
   /**
    * Gets the primary QL class for the ast node.

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

@@ -0,0 +1,20 @@
+private import AstNodes
+private import Expr
+private import Idents
+
+abstract class Callable extends Expr {
+  /**
+   *  Gets the identifier of the call expression.
+   */
+  abstract Idents getIdentifier();
+
+  /**
+   * Gets the name of the call expression.
+   */
+  string getName() { result = this.getIdentifier().getName() }
+
+  /**
+   * Checks if the call expression has a specific name.
+   */
+  predicate hasName(string name) { this.getName() = name }
+}

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

@@ -1,4 +1,3 @@
-
 private import AstNodes
 private import internal.Arguments
 private import internal.Array
@@ -39,158 +38,192 @@ private import internal.TypeDeclaration
 private import internal.UnionType
 private import internal.UserDefinedFunction
 private import internal.VariableDeclaration
+
 /**
  *  A Arguments unknown AST node.
  */
 class Arguments extends AstNode instanceof ArgumentsImpl { }
+
 /**
  *  A Array unknown AST node.
  */
 class Array extends AstNode instanceof ArrayImpl { }
+
 /**
  *  A ArrayType unknown AST node.
  */
 class ArrayType extends AstNode instanceof ArrayTypeImpl { }
+
 /**
  *  A Boolean unknown AST node.
  */
 class Boolean extends AstNode instanceof BooleanImpl { }
+
 /**
  *  A CompatibleIdentifier unknown AST node.
  */
 class CompatibleIdentifier extends AstNode instanceof CompatibleIdentifierImpl { }
+
 /**
  *  A Declaration unknown AST node.
  */
 class Declaration extends AstNode instanceof DeclarationImpl { }
+
 /**
  *  A Decorator unknown AST node.
  */
 class Decorator extends AstNode instanceof DecoratorImpl { }
+
 /**
  *  A Decorators unknown AST node.
  */
 class Decorators extends AstNode instanceof DecoratorsImpl { }
+
 /**
  *  A DiagnosticComment unknown AST node.
  */
 class DiagnosticComment extends AstNode instanceof DiagnosticCommentImpl { }
+
 /**
  *  A EscapeSequence unknown AST node.
  */
 class EscapeSequence extends AstNode instanceof EscapeSequenceImpl { }
+
 /**
  *  A ForLoopParameters unknown AST node.
  */
 class ForLoopParameters extends AstNode instanceof ForLoopParametersImpl { }
-/**
- *  A Identifier unknown AST node.
- */
-class Identifier extends AstNode instanceof IdentifierImpl { }
+
 /**
  *  A ImportFunctionality unknown AST node.
  */
 class ImportFunctionality extends AstNode instanceof ImportFunctionalityImpl { }
+
 /**
  *  A Infrastructure unknown AST node.
  */
 class Infrastructure extends AstNode instanceof InfrastructureImpl { }
+
 /**
  *  A LoopEnumerator unknown AST node.
  */
 class LoopEnumerator extends AstNode instanceof LoopEnumeratorImpl { }
+
 /**
  *  A LoopVariable unknown AST node.
  */
 class LoopVariable extends AstNode instanceof LoopVariableImpl { }
+
 /**
  *  A MetadataDeclaration unknown AST node.
  */
 class MetadataDeclaration extends AstNode instanceof MetadataDeclarationImpl { }
+
 /**
  *  A ModuleDeclaration unknown AST node.
  */
 class ModuleDeclaration extends AstNode instanceof ModuleDeclarationImpl { }
+
 /**
  *  A NegatedType unknown AST node.
  */
 class NegatedType extends AstNode instanceof NegatedTypeImpl { }
+
 /**
  *  A Number unknown AST node.
  */
 class Number extends AstNode instanceof NumberImpl { }
+
 /**
  *  A Object unknown AST node.
  */
 class Object extends AstNode instanceof ObjectImpl { }
+
 /**
  *  A ObjectProperty unknown AST node.
  */
 class ObjectProperty extends AstNode instanceof ObjectPropertyImpl { }
+
 /**
  *  A OutputDeclaration unknown AST node.
  */
 class OutputDeclaration extends AstNode instanceof OutputDeclarationImpl { }
+
 /**
  *  A Parameter unknown AST node.
  */
 class Parameter extends AstNode instanceof ParameterImpl { }
+
 /**
  *  A ParameterDeclaration unknown AST node.
  */
 class ParameterDeclaration extends AstNode instanceof ParameterDeclarationImpl { }
+
 /**
  *  A ParameterizedType unknown AST node.
  */
 class ParameterizedType extends AstNode instanceof ParameterizedTypeImpl { }
+
 /**
  *  A Parameters unknown AST node.
  */
 class Parameters extends AstNode instanceof ParametersImpl { }
+
 /**
  *  A ParenthesizedType unknown AST node.
  */
 class ParenthesizedType extends AstNode instanceof ParenthesizedTypeImpl { }
+
 /**
  *  A PrimitiveType unknown AST node.
  */
 class PrimitiveType extends AstNode instanceof PrimitiveTypeImpl { }
+
 /**
  *  A PropertyIdentifier unknown AST node.
  */
 class PropertyIdentifier extends AstNode instanceof PropertyIdentifierImpl { }
+
 /**
  *  A ResourceDeclaration unknown AST node.
  */
 class ResourceDeclaration extends AstNode instanceof ResourceDeclarationImpl { }
+
 /**
  *  A TargetScopeAssignment unknown AST node.
  */
 class TargetScopeAssignment extends AstNode instanceof TargetScopeAssignmentImpl { }
+
 /**
  *  A TestBlock unknown AST node.
  */
 class TestBlock extends AstNode instanceof TestBlockImpl { }
+
 /**
  *  A Type unknown AST node.
  */
 class Type extends AstNode instanceof TypeImpl { }
+
 /**
  *  A TypeArguments unknown AST node.
  */
 class TypeArguments extends AstNode instanceof TypeArgumentsImpl { }
+
 /**
  *  A TypeDeclaration unknown AST node.
  */
 class TypeDeclaration extends AstNode instanceof TypeDeclarationImpl { }
+
 /**
  *  A UnionType unknown AST node.
  */
 class UnionType extends AstNode instanceof UnionTypeImpl { }
+
 /**
  *  A UserDefinedFunction unknown AST node.
  */
 class UserDefinedFunction extends AstNode instanceof UserDefinedFunctionImpl { }
+
 /**
  *  A VariableDeclaration unknown AST node.
  */

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

@@ -0,0 +1,9 @@
+/**
+ *  Bicep variable declarations.
+ */
+private import bicep
+private import AstNodes
+private import Idents
+private import Stmts
+private import codeql.bicep.controlflow.BasicBlocks as BasicBlocks
+private import codeql.bicep.controlflow.ControlFlowGraph