feat(ast): Update AST layer

Author: GeekMasher

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

@@ -17,6 +17,8 @@ private import internal.SubscriptExpression
 private import internal.TernaryExpression
 private import internal.UnaryExpression
 
+private import Resources
+
 /**
  * An expression in the AST.
  */
@@ -55,7 +57,9 @@ final class LambdaExpression extends Expr instanceof LambdaExpressionImpl { }
 /**
  * A MemberExpression expression in the AST.
  */
-final class MemberExpression extends Expr instanceof MemberExpressionImpl { }
+class MemberExpression extends Expr instanceof MemberExpressionImpl {
+    Object getObject() { result = super.getObject() }
+}
 
 /**
  * An alias for MemberExpression.

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

@@ -2,7 +2,7 @@ private import AstNodes
 private import Expr
 private import internal.Idents
 private import internal.Identifier
-private import internal.Parameter
+private import internal.PropertyIdentifier
 
 /**
  *  A Idents AST node.
@@ -17,3 +17,10 @@ abstract class Idents extends Expr instanceof IdentsImpl {
 class Identifier extends Idents instanceof IdentifierImpl {
     override string getName() { result = IdentifierImpl.super.getName() }
 }
+
+/**
+ *  A PropertyIdentifier unknown AST node.
+ */
+class PropertyIdentifier extends Idents instanceof PropertyIdentifierImpl {
+    override string getName() { result = PropertyIdentifierImpl.super.getName() }
+}

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

@@ -3,11 +3,14 @@
  */
 
 private import AstNodes
+private import Expr
 private import internal.AstNodes
 private import internal.TreeSitter
 private import internal.Literals
+private import internal.Array
 private import internal.Null
 private import internal.NullableReturnType
+private import internal.Number
 private import internal.String
 private import internal.StringContent
 
@@ -17,24 +20,53 @@ private import internal.StringContent
 final class Literals extends AstNode instanceof LiteralsImpl { }
 
 /**
- * A Null literal in the AST.
+ *  A Array unknown AST node.
  */
-final class NullLiteral extends Literals instanceof NullImpl {
+class Array extends Literals instanceof ArrayImpl {
+  Expr getElements() {
+    result = ArrayImpl.super.getElements()
+  }
+
+  Expr getElement(int index) {
+    result = ArrayImpl.super.getElement(index)
+  }
 }
+
+/**
+ * A Null literal in the AST.
+ */
+final class NullLiteral extends Literals instanceof NullImpl { }
+
 /**
  * A NullableReturnType literal in the AST.
  */
-final class NullableReturnTypeLiteral extends Literals instanceof NullableReturnTypeImpl {
+final class NullableReturnTypeLiteral extends Literals instanceof NullableReturnTypeImpl { }
+
+/**
+ *  A Number unknown AST node.
+ */
+class Number extends Literals instanceof NumberImpl {
+  int getValue() {
+    result = NumberImpl.super.getValue().toInt()
+  }
 }
 
+
 /**
  * A String literal in the AST.
  */
-final class StringLiteral extends Literals instanceof StringImpl {
-    string getString() { result = super.getValue() }
+class StringLiteral extends Literals instanceof StringImpl {
+  string getValue() {
+    exists(StringContentLiteral content |
+      content = this.getAChild() and
+      result = content.getValue()
+    )
+  }
 }
+
 /**
  * A StringContent literal in the AST.
  */
-final class StringContentLiteral extends Literals instanceof StringContentImpl {
-}
+class StringContentLiteral extends Literals instanceof StringContentImpl {
+  string getValue() { result = StringContentImpl.super.getValue() }
+}

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

@@ -18,8 +18,6 @@ private import internal.LoopVariable
 private import internal.MetadataDeclaration
 private import internal.ModuleDeclaration
 private import internal.NegatedType
-private import internal.Number
-private import internal.Object
 private import internal.ObjectProperty
 private import internal.OutputDeclaration
 private import internal.Parameter
@@ -29,7 +27,6 @@ private import internal.Parameters
 private import internal.ParenthesizedType
 private import internal.PrimitiveType
 private import internal.PropertyIdentifier
-private import internal.ResourceDeclaration
 private import internal.TargetScopeAssignment
 private import internal.TestBlock
 private import internal.Type
@@ -44,11 +41,6 @@ private import internal.VariableDeclaration
  */
 class Arguments extends AstNode instanceof ArgumentsImpl { }
 
-/**
- *  A Array unknown AST node.
- */
-class Array extends AstNode instanceof ArrayImpl { }
-
 /**
  *  A ArrayType unknown AST node.
  */
@@ -129,21 +121,6 @@ class ModuleDeclaration extends AstNode instanceof ModuleDeclarationImpl { }
  */
 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.
  */
@@ -179,16 +156,6 @@ class ParenthesizedType extends AstNode instanceof ParenthesizedTypeImpl { }
  */
 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.
  */

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

@@ -0,0 +1,106 @@
+private import AstNodes
+private import Expr
+private import Idents
+private import Literals
+
+private import internal.ResourceDeclaration
+private import internal.ObjectProperty
+private import internal.Object
+
+/**
+ *  A Object unknown AST node.
+ */
+class Object extends Expr instanceof ObjectImpl {
+  ObjectProperty getProperties() { result = ObjectImpl.super.getProperties() }
+
+  ObjectProperty getProp(int i) { result = ObjectImpl.super.getProperty(i) }
+
+  Expr getProperty(string name) {
+    exists(ObjectProperty property |
+      property = this.getProperties() and
+      property.getName().getName() = name
+    |
+      result = property.getValue()
+    )
+  }
+}
+
+/**
+ *  A ObjectProperty unknown AST node.
+ */
+class ObjectProperty extends Expr instanceof ObjectPropertyImpl {
+  Idents getName() { result = ObjectPropertyImpl.super.getName() }
+
+  Expr getValue() { result = ObjectPropertyImpl.super.getValue() }
+}
+
+/**
+ *  A ResourceDeclaration unknown AST node.
+ */
+class ResourceDeclaration extends AstNode instanceof ResourceDeclarationImpl {
+  /**
+   *  The name of the resource instance
+   */
+  Idents getIdentifier() { result = ResourceDeclarationImpl.super.getIdentifier() }
+
+  /**
+   *  The name of the resource instance.
+   */
+  Literals getName() { result = ResourceDeclarationImpl.super.getName() }
+
+  /**
+   *  The object that represents the resource.
+   */
+  Object getBody() { result = ResourceDeclarationImpl.super.getObject() }
+
+  ObjectProperty getProperties() { result = this.getBody().getProperties() }
+
+  Expr getProperty(string name) { result = this.getBody().getProperty(name) }
+}
+
+// Resource resolveResource(Expr expr) {
+//   exists(Resource resource |
+//     // Object having an id property needs to be resolved
+//     // {resource.id}.id
+//     exists(MemberExpr memexpr |
+//       memexpr = expr.(Object).getProperty("id") and
+//       memexpr.getObject().(Identifier).getName() = resource.getIdentifier().(Identifier).getName()
+//     |
+//       result = resource
+//     )
+//     or
+//     exists(Identifier ident |
+//       ident = expr and
+//       ident.getName() = resource.getIdentifier().(Identifier).getName()
+//     |
+//       result = resource
+//     )
+//   )
+// }
+
+
+class Resource extends TResource {
+  private ResourceDeclaration resource;
+
+  Resource() { this = TResourceDeclaration(resource) }
+
+  string getResourceType() {
+    exists(StringLiteral sl | sl = resource.getName() | result = sl.getValue())
+  }
+
+  Expr getProperty(string name) {
+    result = resource.getProperty(name)
+  }
+
+  string toString() { result = "Resource[" + resource.getIdentifier().getName() + "]" }
+
+  string getAPrimaryQlClass() { result = "Resource" }
+}
+
+cached
+private module Cached {
+  cached
+  newtype TResource = TResourceDeclaration(ResourceDeclaration rd)
+}
+
+private import Cached

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

@@ -3,9 +3,11 @@
  *
  *  WARNING: this file is generated, do not edit manually
  */
+
 private import AstNodes
 private import TreeSitter
 private import codeql.bicep.ast.AstNodes
+private import Expr
 
 /**
  *  A Array AST Node.
@@ -19,6 +21,7 @@ class ArrayImpl extends TArray, AstNode {
 
   override string toString() { result = ast.toString() }
 
+  ExprImpl getElements() { toTreeSitter(result) = ast.getChild(_) }
 
-
-}
+  ExprImpl getElement(int index) { toTreeSitter(result) = ast.getChild(index) }
+}

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

@@ -75,12 +75,13 @@ newtype TAstNode =
  * A literal value in a Bicep program
  */
 class TLiterals =
-  TInterpolation or TNull or TNullableReturnType or TNullableType or TString or TStringContent;
+  TArray or TInterpolation or TNull or TNullableReturnType or TNullableType or TNumber or TString or
+      TStringContent;
 
 /**
  *  A identifier in a SQL program
  */
-class TIdents = TIdentifier;
+class TIdents = TIdentifier or TPropertyIdentifier;
 
 /**
  * A statement in a Bicep program
@@ -93,10 +94,10 @@ class TStmts =
  * A expersion value in a Bicep program
  */
 class TExpr =
-  TLiterals or TConditionalExpr or TStmts or TIdents or TAssignmentExpression or
-      TBinaryExpression or TCallExpression or TExpression or TLambdaExpression or
-      TMemberExpression or TParenthesizedExpression or TPrimaryExpression or TResourceExpression or
-      TSubscriptExpression or TTernaryExpression or TUnaryExpression;
+  TLiterals or TConditionalExpr or TStmts or TIdents or TObject or TObjectProperty or
+      TAssignmentExpression or TBinaryExpression or TCallExpression or TExpression or
+      TLambdaExpression or TMemberExpression or TParenthesizedExpression or TPrimaryExpression or
+      TResourceExpression or TSubscriptExpression or TTernaryExpression or TUnaryExpression;
 
 /**
  * A expersion value in a Bicep program

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

@@ -3,11 +3,13 @@
  *
  *  WARNING: this file is generated, do not edit manually
  */
+
 private import AstNodes
 private import TreeSitter
 private import codeql.bicep.ast.AstNodes
 private import Expr
-
+private import Object
+private import PropertyIdentifier
 
 /**
  *  A MemberExpression AST Node.
@@ -21,6 +23,7 @@ class MemberExpressionImpl extends TMemberExpression, ExprImpl {
 
   override string toString() { result = ast.toString() }
 
+  ObjectImpl getObject() { toTreeSitter(result) = ast.getObject() }
 
-
-}
+  PropertyIdentifierImpl getProperty() { toTreeSitter(result) = ast.getProperty() }
+}

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

@@ -3,14 +3,16 @@
  *
  *  WARNING: this file is generated, do not edit manually
  */
+
 private import AstNodes
 private import TreeSitter
 private import codeql.bicep.ast.AstNodes
+private import Literals
 
 /**
  *  A Number AST Node.
  */
-class NumberImpl extends TNumber, AstNode {
+class NumberImpl extends TNumber, LiteralsImpl {
   private BICEP::Number ast;
 
   override string getAPrimaryQlClass() { result = "Number" }
@@ -19,6 +21,5 @@ class NumberImpl extends TNumber, AstNode {
 
   override string toString() { result = ast.toString() }
 
-
-
-}
+  override string getValue() { result = ast.getValue() }
+}