feat(ast): Update Calls and Outputs

Author: GeekMasher

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

@@ -7,6 +7,7 @@ private import internal.CallExpression
 private import internal.Parameter
 private import internal.Parameters
 private import internal.ParameterDeclaration
+private import internal.OutputDeclaration
 private import internal.UserDefinedFunction
 
 abstract class Callable extends Expr {
@@ -29,109 +30,84 @@ abstract class Callable extends Expr {
 /**
  * A CallExpression expression in the AST.
  */
-class CallExpression extends Callable instanceof CallExpressionImpl {
-  override Idents getIdentifier() {
-    result = CallExpressionImpl.super.getIdentifier()
-  }
-
-  Expr getArgument(int index) {
-    result = this.getDeclaredArguments().getArgument(index)
-  }
-
-  Expr getArguments() {
-    result = this.getDeclaredArguments().getArguments()
-  }
-
-  Arguments getDeclaredArguments() {
-    result = CallExpressionImpl.super.getArguments()
-  }
-}
+class CallExpression extends Expr instanceof CallExpressionImpl {
+  Idents getIdentifier() { result = CallExpressionImpl.super.getIdentifier() }
+
+  string getName() { result = this.getIdentifier().getName() }
 
+  Expr getArgument(int index) { result = this.getDeclaredArguments().getArgument(index) }
+
+  Expr getArguments() { result = this.getDeclaredArguments().getArguments() }
+
+  Arguments getDeclaredArguments() { result = CallExpressionImpl.super.getArguments() }
+}
 
 /**
  *  A Arguments unknown AST node.
  */
 class Arguments extends AstNode instanceof ArgumentsImpl {
+  Expr getArgument(int index) { result = ArgumentsImpl.super.getArgument(index) }
 
-  Expr getArgument(int index) {
-    result = ArgumentsImpl.super.getArgument(index)
-  }
-
-  Expr getArguments() {
-    result = ArgumentsImpl.super.getArguments()
-  }
+  Expr getArguments() { result = ArgumentsImpl.super.getArguments() }
 }
 
 /**
  *  A Parameter unknown AST node.
  */
 class Parameter extends AstNode instanceof ParameterImpl {
+  Idents getName() { result = ParameterImpl.super.getName() }
 
-  Idents getName() {
-    result = ParameterImpl.super.getName()
-  }
-
-  Type getType() {
-    result = ParameterImpl.super.getType()
-  }
+  Type getType() { result = ParameterImpl.super.getType() }
 }
 
 /**
  *  A Parameters unknown AST node.
  */
 class Parameters extends AstNode instanceof ParametersImpl {
-  Parameter getParameter(int index) {
-    result = ParametersImpl.super.getParameter(index)
-  }
+  Parameter getParameter(int index) { result = ParametersImpl.super.getParameter(index) }
 }
 
-
 /**
  *  A ParameterDeclaration unknown AST node.
  */
-class ParameterDeclaration extends AstNode instanceof ParameterDeclarationImpl { 
-  Identifier getName() {
-    result = ParameterDeclarationImpl.super.getName()
-  }
-
-  Type getType() {
-    result = ParameterDeclarationImpl.super.getType()
-  }
-
-  Expr getDefaultValue() {
-    result = ParameterDeclarationImpl.super.getDefaultValue()
-  }
+class ParameterDeclaration extends AstNode instanceof ParameterDeclarationImpl {
+  Identifier getIdentifier() { result = ParameterDeclarationImpl.super.getName() }
+
+  string getName() { result = this.getIdentifier().getName() }
+
+  Type getType() { result = ParameterDeclarationImpl.super.getType() }
+
+  Expr getDefaultValue() { result = ParameterDeclarationImpl.super.getDefaultValue() }
+}
+
+/**
+ *  A OutputDeclaration unknown AST node.
+ */
+class OutputDeclaration extends AstNode instanceof OutputDeclarationImpl {
+  Identifier getIdentifier() { result = OutputDeclarationImpl.super.getIdentifier() }
+
+  string getName() { result = this.getIdentifier().getName() }
+
+  Type getType() { result = OutputDeclarationImpl.super.getType() }
+
+  Expr getValue() { result = OutputDeclarationImpl.super.getValue() }
 }
 
 /**
  *  A UserDefinedFunction unknown AST node.
  */
 class UserDefinedFunction extends AstNode instanceof UserDefinedFunctionImpl {
-  Identifier getIdentifier() {
-    result = UserDefinedFunctionImpl.super.getName()
-  }
+  Identifier getIdentifier() { result = UserDefinedFunctionImpl.super.getName() }
 
-  string getName() {
-    result = this.getIdentifier().getName()
-  }
+  string getName() { result = this.getIdentifier().getName() }
 
-  Type getReturnType() {
-    result = UserDefinedFunctionImpl.super.getReturnType()
-  }
+  Type getReturnType() { result = UserDefinedFunctionImpl.super.getReturnType() }
 
-  Parameters getDeclaredParameters() {
-    result = UserDefinedFunctionImpl.super.getParameters()
-  }
+  Parameters getDeclaredParameters() { result = UserDefinedFunctionImpl.super.getParameters() }
 
-  Parameter getParameters() {
-    result = this.getDeclaredParameters().getParameter(_)
-  }
+  Parameter getParameters() { result = this.getDeclaredParameters().getParameter(_) }
 
-  Parameter getParameter(int index) {
-    result = this.getDeclaredParameters().getParameter(index)
-  }
+  Parameter getParameter(int index) { result = this.getDeclaredParameters().getParameter(index) }
 
-  Expr getBody() {
-    result = UserDefinedFunctionImpl.super.getBody()
-  }
+  Expr getBody() { result = UserDefinedFunctionImpl.super.getBody() }
 }

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

@@ -18,7 +18,6 @@ private import internal.MetadataDeclaration
 private import internal.ModuleDeclaration
 private import internal.NegatedType
 private import internal.ObjectProperty
-private import internal.OutputDeclaration
 private import internal.ParameterizedType
 private import internal.ParenthesizedType
 private import internal.PrimitiveType
@@ -102,10 +101,6 @@ class ModuleDeclaration extends AstNode instanceof ModuleDeclarationImpl { }
  */
 class NegatedType extends AstNode instanceof NegatedTypeImpl { }
 
-/**
- *  A OutputDeclaration unknown AST node.
- */
-class OutputDeclaration extends AstNode instanceof OutputDeclarationImpl { }
 
 /**
  *  A ParameterizedType unknown AST node.

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

@@ -6,6 +6,9 @@
 private import AstNodes
 private import TreeSitter
 private import codeql.bicep.ast.AstNodes
+private import Idents
+private import Expr
+private import Type
 
 /**
  *  A OutputDeclaration AST Node.
@@ -19,6 +22,15 @@ class OutputDeclarationImpl extends TOutputDeclaration, AstNode {
 
   override string toString() { result = ast.toString() }
 
+  IdentsImpl getIdentifier() {
+    toTreeSitter(result) = ast.getChild(0)
+  }
 
+  TypeImpl getType() {
+    toTreeSitter(result) = ast.getChild(1)
+  }
 
+  ExprImpl getValue() {
+    toTreeSitter(result) = ast.getChild(2)
+  }
 }