fix: handle context accesses following calls

Signed-off-by: William Woodruff <[email protected]>

Author: woodruffw

Diff for: src/expr/expr.pest

@@ -46,8 +46,8 @@ primary_expr = {
   | string
   | boolean
   | null
-  | index
   | function_call
+  | index
   | context
   | "(" ~ primary_expr ~ ")"
 }
@@ -72,12 +72,12 @@ boolean = { "true" | "false" }
 null = { "null" }
 
 /// Context references (e.g., github.event.issue.number)
-context    = ${ identifier ~ ("." ~ (identifier | star))* }
+context    = ${ identifier ~ (("." ~ (identifier | star)) | index)* }
 star       =  { "*" }
 identifier = @{ (ASCII_ALPHA | "_" | "-") ~ (ASCII_ALPHANUMERIC | "_" | "-")* }
 
 /// Function calls
-function_call = { identifier ~ "(" ~ (or_expr ~ ("," ~ or_expr)*)? ~ ")" }
+function_call = { identifier ~ "(" ~ (or_expr ~ ("," ~ or_expr)*)? ~ ")" ~ (index | ("." ~ context))? }
 
 /// Index operations
-index = { (context | function_call | ("(" ~ primary_expr ~ ")")) ~ ("[" ~ (or_expr | star) ~ "]")+ }
+index = { ("[" ~ (or_expr | star) ~ "]")+ }

Diff for: src/expr/mod.rs

@@ -365,6 +365,7 @@ mod tests {
             "(true == false) == true",
             "(true == (false || true && (true || false))) == true",
             "(github.actor != 'github-actions[bot]' && github.actor) == 'BrewTestBot'",
+            "fromJson(steps.runs.outputs.data).workflow_runs[0].id",
         ];
 
         for case in cases {
@@ -413,17 +414,19 @@ mod tests {
             ("foo.bar.baz", Expr::Context("foo.bar.baz".into())),
             (
                 "foo.bar.baz[1][2]",
-                Expr::Index {
-                    parent: Expr::Context("foo.bar.baz".into()).into(),
-                    indices: vec![Expr::Number(1.0), Expr::Number(2.0)],
-                },
+                Expr::Context("foo.bar.baz[1][2]".into()),
+                // Expr::Index {
+                //     parent: Expr::Context("foo.bar.baz".into()).into(),
+                //     indices: vec![Expr::Number(1.0), Expr::Number(2.0)],
+                // },
             ),
             (
                 "foo.bar.baz[*]",
-                Expr::Index {
-                    parent: Expr::Context("foo.bar.baz".into()).into(),
-                    indices: vec![Expr::Star],
-                },
+                Expr::Context("foo.bar.baz[*]".into()),
+                // Expr::Index {
+                //     parent: Expr::Context("foo.bar.baz".into()).into(),
+                //     indices: vec![Expr::Star],
+                // },
             ),
             (
                 "vegetables.*.ediblePortions",
@@ -473,7 +476,18 @@ mod tests {
                     op: BinOp::Or, rhs: Expr::Boolean(false).into()
                     }.into()
                 }
-            )
+            ),
+            (
+                // BUG: AST is incorrect here
+                "fromJson(steps.runs.outputs.data).workflow_runs[0].id",
+                Expr::Call {
+                    func: "fromJson".into(),
+                    args: vec![
+                        Expr::Context("steps.runs.outputs.data".into()).into(),
+                        Expr::Context("workflow_runs[0].id".into()).into(),
+                    ]
+                }
+            ),
         ];
 
         for (case, expr) in cases {