feat(ast): Update Literals and fix resources

Author: GeekMasher

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

@@ -17,6 +17,7 @@ private import internal.SubscriptExpression
 private import internal.TernaryExpression
 private import internal.UnaryExpression
 
+private import Idents
 private import Resources
 
 /**
@@ -59,6 +60,8 @@ final class LambdaExpression extends Expr instanceof LambdaExpressionImpl { }
  */
 class MemberExpression extends Expr instanceof MemberExpressionImpl {
     Object getObject() { result = super.getObject() }
+
+    Idents getProperty() { result = super.getProperty() }
 }
 
 /**

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

@@ -8,6 +8,7 @@ private import internal.AstNodes
 private import internal.TreeSitter
 private import internal.Literals
 private import internal.Array
+private import internal.Boolean
 private import internal.Null
 private import internal.NullableReturnType
 private import internal.Number
@@ -23,15 +24,32 @@ final class Literals extends AstNode instanceof LiteralsImpl { }
  *  A Array unknown AST node.
  */
 class Array extends Literals instanceof ArrayImpl {
-  Expr getElements() {
-    result = ArrayImpl.super.getElements()
-  }
+  Expr getElements() { result = ArrayImpl.super.getElements() }
+
+  Expr getElement(int index) { result = ArrayImpl.super.getElement(index) }
+}
 
-  Expr getElement(int index) {
-    result = ArrayImpl.super.getElement(index)
+/**
+ *  A Boolean unknown AST node.
+ */
+class Boolean extends Literals instanceof BooleanImpl {
+  boolean getBool() {
+    exists(string bl |
+      bl = BooleanImpl.super.getValue().toLowerCase() and
+      bl = "true" and
+      result = true
+      or
+      bl = "false" and
+      result = false
+    )
   }
 }
 
+/**
+ * An alias for the Boolean literal in the AST.
+ */
+class BooleanLiteral = Boolean;
+
 /**
  * A Null literal in the AST.
  */
@@ -46,12 +64,9 @@ final class NullableReturnTypeLiteral extends Literals instanceof NullableReturn
  *  A Number unknown AST node.
  */
 class Number extends Literals instanceof NumberImpl {
-  int getValue() {
-    result = NumberImpl.super.getValue().toInt()
-  }
+  int getValue() { result = NumberImpl.super.getValue().toInt() }
 }
 
-
 /**
  * A String literal in the AST.
  */

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

@@ -46,10 +46,6 @@ class Arguments extends AstNode instanceof ArgumentsImpl { }
  */
 class ArrayType extends AstNode instanceof ArrayTypeImpl { }
 
-/**
- *  A Boolean unknown AST node.
- */
-class Boolean extends AstNode instanceof BooleanImpl { }
 
 /**
  *  A CompatibleIdentifier unknown AST node.

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

@@ -58,25 +58,25 @@ class ResourceDeclaration extends AstNode instanceof ResourceDeclarationImpl {
   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
-//     )
-//   )
-// }
+Resource resolveResource(Expr expr) {
+  exists(ResourceDeclaration resource |
+    // Object having an id property needs to be resolved
+    // {resource.id}.id
+    exists(MemberExpr memexpr |
+      memexpr = expr.(Object).getProperty("id") and
+      memexpr.getProperty().getName() = resource.getIdentifier().getName()
+    |
+      result = TResourceDeclaration(resource)
+    )
+    or
+    exists(Identifier ident |
+      ident = expr and
+      ident.getName() = resource.getIdentifier().(Identifier).getName()
+    |
+      result = TResourceDeclaration(resource)
+    )
+  )
+}
 
 
 class Resource extends TResource {

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

@@ -75,8 +75,8 @@ newtype TAstNode =
  * A literal value in a Bicep program
  */
 class TLiterals =
-  TArray or TInterpolation or TNull or TNullableReturnType or TNullableType or TNumber or TString or
-      TStringContent;
+  TArray or TBoolean or TInterpolation or TNull or TNullableReturnType or TNullableType or
+      TNumber or TString or TStringContent;
 
 /**
  *  A identifier in a SQL program

ql/lib/codeql/bicep/ast/internal/Boolean.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 Boolean AST Node.
  */
-class BooleanImpl extends TBoolean, AstNode {
+class BooleanImpl extends TBoolean, LiteralsImpl {
   private BICEP::Boolean ast;
 
   override string getAPrimaryQlClass() { result = "Boolean" }
@@ -19,6 +21,5 @@ class BooleanImpl extends TBoolean, AstNode {
 
   override string toString() { result = ast.toString() }
 
-
-
-}
+  override string getValue() { result = ast.getValue() }
+}