Fix output type inference when using tags from optional scopes.

obi1kenobi · Jul 2, 2024 · 5a31e02 · 5a31e02
1 parent 99d8189
commit 5a31e02
Show file tree

Hide file tree

Showing 29 changed files with 1,585 additions and 82 deletions.
diff --git a/trustfall_core/src/frontend/error.rs b/trustfall_core/src/frontend/error.rs
@@ -293,9 +293,9 @@ impl FilterTypeError {
     /// the tag name separately if needed.
     fn represent_argument(argument: &Argument, tag_name: Option<&str>) -> String {
         match argument {
-            Argument::Tag(tag) => Self::represent_tag_name_and_type(
+            Argument::Tag(tag, ..) => Self::represent_tag_name_and_type(
                 tag_name.expect("tag argument without a name"),
-                tag.field_type(),
+                argument.field_type(),
             ),
             Argument::Variable(var) => {
                 Self::represent_variable_name_and_type(&var.variable_name, &var.variable_type)

diff --git a/trustfall_core/src/frontend/filters.rs b/trustfall_core/src/frontend/filters.rs
@@ -7,13 +7,13 @@ use crate::{
 use super::{
     error::{FilterTypeError, FrontendError},
     tags::{TagHandler, TagLookupError},
-    util::ComponentPath,
+    util::QueryPath,
 };
 
 #[allow(clippy::too_many_arguments)]
 pub(super) fn make_filter_expr(
     schema: &Schema,
-    component_path: &ComponentPath,
+    query_path: &QueryPath,
     tags: &mut TagHandler<'_>,
     current_vertex_vid: Vid,
     left_operand: OperationSubject,
@@ -36,7 +36,7 @@ pub(super) fn make_filter_expr(
                     OperatorArgument::TagRef(tag_name) => {
                         let defined_tag = match tags.reference_tag(
                             tag_name.as_ref(),
-                            component_path,
+                            query_path,
                             current_vertex_vid,
                         ) {
                             Ok(defined_tag) => defined_tag,
@@ -60,7 +60,7 @@ pub(super) fn make_filter_expr(
                             }
                         };
 
-                        Argument::Tag(defined_tag.field.clone())
+                        defined_tag.create_tag_argument(query_path)
                     }
                 })
             },