diff --git a/trustfall_core/src/frontend/mod.rs b/trustfall_core/src/frontend/mod.rs index f0cb1dfe..b7d4e06f 100644 --- a/trustfall_core/src/frontend/mod.rs +++ b/trustfall_core/src/frontend/mod.rs @@ -731,10 +731,7 @@ where // TODO: fixme, temporary hack to avoid changing the IRQueryComponent struct let hacked_outputs = component_outputs .into_iter() - .filter_map(|(k, v)| match v { - FieldRef::ContextField(c) => Some((k, c)), - FieldRef::FoldSpecificField(_) => None, - }) + .filter(|(k, v)| !matches!(&v, FieldRef::FoldSpecificField(..))) .collect(); Ok(IRQueryComponent { diff --git a/trustfall_core/src/interpreter/execution.rs b/trustfall_core/src/interpreter/execution.rs index 73a87c87..5a4b9715 100644 --- a/trustfall_core/src/interpreter/execution.rs +++ b/trustfall_core/src/interpreter/execution.rs @@ -193,29 +193,37 @@ fn construct_outputs<'query, AdapterT: Adapter<'query>>( let mut output_iterator = iterator; for output_name in output_names.iter() { - let context_field = &root_component.outputs[output_name]; - let vertex_id = context_field.vertex_id; + let field_ref = &root_component.outputs[output_name]; - let moved_iterator = Box::new(output_iterator.map(move |context| { - let new_vertex = context.vertices[&vertex_id].clone(); - context.move_to_vertex(new_vertex) - })); + match field_ref { + FieldRef::ContextField(context_field) => { + let vertex_id = context_field.vertex_id; - let resolve_info = ResolveInfo::new(query, vertex_id, true); + let moved_iterator = Box::new(output_iterator.map(move |context| { + let new_vertex = context.vertices[&vertex_id].clone(); + context.move_to_vertex(new_vertex) + })); - let type_name = &root_component.vertices[&vertex_id].type_name; - let field_data_iterator = adapter.resolve_property( - moved_iterator, - type_name, - &context_field.field_name, - &resolve_info, - ); - query = resolve_info.into_inner(); + let resolve_info = ResolveInfo::new(query, vertex_id, true); - output_iterator = Box::new(field_data_iterator.map(|(mut context, value)| { - context.values.push(value); - context - })); + let type_name = &root_component.vertices[&vertex_id].type_name; + let field_data_iterator = adapter.resolve_property( + moved_iterator, + type_name, + &context_field.field_name, + &resolve_info, + ); + query = resolve_info.into_inner(); + + output_iterator = Box::new(field_data_iterator.map(|(mut context, value)| { + context.values.push(value); + context + })); + } + FieldRef::FoldSpecificField(_) => { + unreachable!("found fold-specific field in component outputs: {root_component:#?}") + } + } } let expected_output_names: BTreeSet<_> = query.indexed_query.outputs.keys().cloned().collect(); carrier.query = Some(query); @@ -648,27 +656,36 @@ mismatch on whether the fold below {expanding_from_vid:?} was inside an `@option // This is a slimmed-down version of computing a context field: // - it does not restore the prior active vertex after getting each value // - it already knows that the context field is guaranteed to exist - let context_field = &fold.component.outputs[output_name.as_ref()]; - let vertex_id = context_field.vertex_id; - let moved_iterator = Box::new(output_iterator.map(move |context| { - let new_vertex = context.vertices[&vertex_id].clone(); - context.move_to_vertex(new_vertex) - })); - - let query = cloned_carrier.query.take().expect("query was not returned"); - let resolve_info = ResolveInfo::new(query, vertex_id, true); - let field_data_iterator = cloned_adapter.resolve_property( - moved_iterator, - &fold.component.vertices[&vertex_id].type_name, - &context_field.field_name, - &resolve_info, - ); - cloned_carrier.query = Some(resolve_info.into_inner()); - - output_iterator = Box::new(field_data_iterator.map(|(mut context, value)| { - context.values.push(value); - context - })); + let field_ref = &fold.component.outputs[output_name.as_ref()]; + + match field_ref { + FieldRef::ContextField(context_field) => { + let vertex_id = context_field.vertex_id; + let moved_iterator = Box::new(output_iterator.map(move |context| { + let new_vertex = context.vertices[&vertex_id].clone(); + context.move_to_vertex(new_vertex) + })); + + let query = cloned_carrier.query.take().expect("query was not returned"); + let resolve_info = ResolveInfo::new(query, vertex_id, true); + let field_data_iterator = cloned_adapter.resolve_property( + moved_iterator, + &fold.component.vertices[&vertex_id].type_name, + &context_field.field_name, + &resolve_info, + ); + cloned_carrier.query = Some(resolve_info.into_inner()); + + output_iterator = + Box::new(field_data_iterator.map(|(mut context, value)| { + context.values.push(value); + context + })); + } + FieldRef::FoldSpecificField(_) => { + unreachable!("found fold-specific field in component outputs: {fold:#?}") + } + } } for mut folded_context in output_iterator { diff --git a/trustfall_core/src/interpreter/helpers/correctness.rs b/trustfall_core/src/interpreter/helpers/correctness.rs index cde76ee6..214e8e51 100644 --- a/trustfall_core/src/interpreter/helpers/correctness.rs +++ b/trustfall_core/src/interpreter/helpers/correctness.rs @@ -3,8 +3,8 @@ use std::{collections::BTreeMap, fmt::Debug, num::NonZeroUsize, sync::Arc}; use crate::{ interpreter::{Adapter, DataContext, InterpretedQuery, ResolveEdgeInfo, ResolveInfo}, ir::{ - ContextField, EdgeParameters, Eid, FieldValue, IREdge, IRQuery, IRQueryComponent, IRVertex, - TransparentValue, Type, Vid, + ContextField, EdgeParameters, Eid, FieldRef, FieldValue, IREdge, IRQuery, IRQueryComponent, + IRVertex, TransparentValue, Type, Vid, }, schema::{Schema, SchemaAdapter}, TryIntoStruct, @@ -166,11 +166,11 @@ fn make_resolve_info_for_property_check( edges: Default::default(), folds: Default::default(), outputs: btreemap! { - property_name.clone() => ContextField { + property_name.clone() => FieldRef::ContextField(ContextField { vertex_id: vid, field_name: property_name.clone(), field_type: Type::parse(property_type).expect("not a valid type"), - } + }) }, }), variables: Default::default(), @@ -324,11 +324,11 @@ fn make_resolve_edge_info_for_edge_check( }, folds: Default::default(), outputs: btreemap! { - property_name.clone() => ContextField { + property_name.clone() => FieldRef::ContextField(ContextField { vertex_id: vid, field_name: property_name, field_type: Type::parse("String!").expect("not a valid type"), - } + }) }, }), variables: Default::default(), @@ -493,11 +493,11 @@ fn make_resolve_info_for_type_coercion( edges: Default::default(), folds: Default::default(), outputs: btreemap! { - typename_property.clone() => ContextField { + typename_property.clone() => FieldRef::ContextField(ContextField { vertex_id: vid, field_name: typename_property.clone(), field_type: Type::parse("String!").expect("not a valid type"), - } + }) }, }), variables: Default::default(), diff --git a/trustfall_core/src/interpreter/hints/vertex_info.rs b/trustfall_core/src/interpreter/hints/vertex_info.rs index 4574870a..02df71d5 100644 --- a/trustfall_core/src/interpreter/hints/vertex_info.rs +++ b/trustfall_core/src/interpreter/hints/vertex_info.rs @@ -165,8 +165,8 @@ impl VertexInfo for T { let properties = current_component .outputs .values() - .filter(|c| c.vertex_id == current_vertex.vid) - .map(|c| RequiredProperty::new(c.field_name.clone())); + .filter(|c| c.defined_at() == current_vertex.vid) + .map(|c| RequiredProperty::new(c.field_name_arc())); let properties = properties.chain( current_vertex diff --git a/trustfall_core/src/ir/indexed.rs b/trustfall_core/src/ir/indexed.rs index 7c302cee..2592cd25 100644 --- a/trustfall_core/src/ir/indexed.rs +++ b/trustfall_core/src/ir/indexed.rs @@ -154,7 +154,7 @@ fn add_data_from_component( } for (output_name, field) in component.outputs.iter() { - let output_vid = field.vertex_id; + let output_vid = field.defined_at(); // the output must be from a vertex in this component let output_component = @@ -166,7 +166,7 @@ fn add_data_from_component( let output_name = output_name.clone(); let output_type = get_output_type( output_vid, - &field.field_type, + field.field_type(), &component_optional_vertices, are_folds_optional, ); diff --git a/trustfall_core/src/ir/mod.rs b/trustfall_core/src/ir/mod.rs index cab37123..49da6703 100644 --- a/trustfall_core/src/ir/mod.rs +++ b/trustfall_core/src/ir/mod.rs @@ -118,7 +118,7 @@ pub struct IRQueryComponent { pub folds: BTreeMap>, #[serde(default, skip_serializing_if = "BTreeMap::is_empty")] - pub outputs: BTreeMap, ContextField>, + pub outputs: BTreeMap, FieldRef>, } /// Intermediate representation of a query @@ -319,6 +319,13 @@ impl FieldRef { } } + pub fn field_name_arc(&self) -> Arc { + match self { + FieldRef::ContextField(c) => c.field_name.clone(), + FieldRef::FoldSpecificField(f) => f.kind.field_name().into(), + } + } + /// The vertex ID at which this reference is considered defined. pub fn defined_at(&self) -> Vid { match self { diff --git a/trustfall_core/test_data/tests/execution_errors/both_missing_and_unused.ir.ron b/trustfall_core/test_data/tests/execution_errors/both_missing_and_unused.ir.ron index a9835aee..a5ba3ff8 100644 --- a/trustfall_core/test_data/tests/execution_errors/both_missing_and_unused.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/both_missing_and_unused.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/execution_errors/invalid_argument_types.ir.ron b/trustfall_core/test_data/tests/execution_errors/invalid_argument_types.ir.ron index abc573c7..dc851cf5 100644 --- a/trustfall_core/test_data/tests/execution_errors/invalid_argument_types.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/invalid_argument_types.ir.ron @@ -33,11 +33,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/execution_errors/invalid_null_argument_values.ir.ron b/trustfall_core/test_data/tests/execution_errors/invalid_null_argument_values.ir.ron index 17bd69b5..77bde985 100644 --- a/trustfall_core/test_data/tests/execution_errors/invalid_null_argument_values.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/invalid_null_argument_values.ir.ron @@ -33,11 +33,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/execution_errors/missing_argument.ir.ron b/trustfall_core/test_data/tests/execution_errors/missing_argument.ir.ron index 3210a59d..e8f9dd69 100644 --- a/trustfall_core/test_data/tests/execution_errors/missing_argument.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/missing_argument.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/execution_errors/missing_unused_and_invalid_arguments.ir.ron b/trustfall_core/test_data/tests/execution_errors/missing_unused_and_invalid_arguments.ir.ron index 3ff6b1ab..ae529c19 100644 --- a/trustfall_core/test_data/tests/execution_errors/missing_unused_and_invalid_arguments.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/missing_unused_and_invalid_arguments.ir.ron @@ -40,11 +40,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_list_with_null_argument.ir.ron b/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_list_with_null_argument.ir.ron index 6cd32a77..37785f3f 100644 --- a/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_list_with_null_argument.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_list_with_null_argument.ir.ron @@ -27,16 +27,16 @@ Ok(TestIRQuery( ), }, outputs: { - "intNonNullList": ContextField( + "intNonNullList": ContextField(ContextField( vertex_id: Vid(1), field_name: "intNonNullList", field_type: "[Int]!", - ), - "nonNullIntList": ContextField( + )), + "nonNullIntList": ContextField(ContextField( vertex_id: Vid(1), field_name: "nonNullIntList", field_type: "[Int!]", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_null_argument.ir.ron b/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_null_argument.ir.ron index d59b404d..cb1b1f32 100644 --- a/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_null_argument.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/type_narrowing_prevents_null_argument.ir.ron @@ -27,16 +27,16 @@ Ok(TestIRQuery( ), }, outputs: { - "intNonNullList": ContextField( + "intNonNullList": ContextField(ContextField( vertex_id: Vid(1), field_name: "intNonNullList", field_type: "[Int]!", - ), - "nonNullIntList": ContextField( + )), + "nonNullIntList": ContextField(ContextField( vertex_id: Vid(1), field_name: "nonNullIntList", field_type: "[Int!]", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/execution_errors/unused_argument.ir.ron b/trustfall_core/test_data/tests/execution_errors/unused_argument.ir.ron index 23fae1a6..7b54f650 100644 --- a/trustfall_core/test_data/tests/execution_errors/unused_argument.ir.ron +++ b/trustfall_core/test_data/tests/execution_errors/unused_argument.ir.ron @@ -17,16 +17,16 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.ir.ron b/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.ir.ron index 13466295..01017c09 100644 --- a/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.ir.ron @@ -23,16 +23,16 @@ Ok(TestIRQuery( ), }, outputs: { - "succ_is_named": ContextField( + "succ_is_named": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.trace.ron b/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.trace.ron index cf7868cc..b6a7f3c1 100644 --- a/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/alias_and_prefix_output_names.trace.ron @@ -204,16 +204,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "succ_is_named": ContextField( + "succ_is_named": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.ir.ron b/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.ir.ron index 05b3a359..b6fdeb5b 100644 --- a/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.ir.ron @@ -23,16 +23,16 @@ Ok(TestIRQuery( ), }, outputs: { - "succ_value": ContextField( + "succ_value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.trace.ron b/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.trace.ron index c492dd97..3e9a19b3 100644 --- a/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/alias_driven_output_names.trace.ron @@ -204,16 +204,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "succ_value": ContextField( + "succ_value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.ir.ron b/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.ir.ron index a5e10890..5831bee6 100644 --- a/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.ir.ron @@ -33,16 +33,16 @@ Ok(TestIRQuery( ), }, outputs: { - "one": ContextField( + "one": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "successor": ContextField( + )), + "successor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.trace.ron b/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.trace.ron index 71ba400f..6a6da00d 100644 --- a/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/alias_driven_tag_and_output_names.trace.ron @@ -316,16 +316,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "one": ContextField( + "one": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "successor": ContextField( + )), + "successor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.ir.ron b/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.ir.ron index 2e943749..975d8f8e 100644 --- a/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.ir.ron @@ -23,16 +23,16 @@ Ok(TestIRQuery( ), }, outputs: { - "successor": ContextField( + "successor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.trace.ron b/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.trace.ron index 2eac0bce..ac695a60 100644 --- a/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/avoid_output_name_conflict_with_alias_name.trace.ron @@ -204,16 +204,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "successor": ContextField( + "successor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.ir.ron index c8cae80d..f1fdf8bc 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.ir.ron @@ -32,21 +32,21 @@ Ok(TestIRQuery( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.trace.ron index 6602e441..7103140b 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_allows_additional_edge.trace.ron @@ -1896,21 +1896,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.ir.ron index 6ef03d15..7a72a6e4 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.ir.ron @@ -30,16 +30,16 @@ Ok(TestIRQuery( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.trace.ron index 77a6b491..6acadfed 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_edge.trace.ron @@ -1346,16 +1346,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.ir.ron index f6d39db3..8e0ad8e2 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.ir.ron @@ -32,21 +32,21 @@ Ok(TestIRQuery( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.trace.ron index ec51aea7..77b661de 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_folded_edge.trace.ron @@ -1187,21 +1187,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.ir.ron index 417e6ea3..f3251f05 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.ir.ron @@ -31,16 +31,16 @@ Ok(TestIRQuery( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.trace.ron index 0fe1c99c..f906d199 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_optional_edge.trace.ron @@ -849,16 +849,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.ir.ron index 078d0a24..dc76ccc9 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.ir.ron @@ -33,16 +33,16 @@ Ok(TestIRQuery( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.trace.ron index e90af64b..11865136 100644 --- a/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/coercion_on_recursed_edge.trace.ron @@ -2430,16 +2430,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/deep_optional.ir.ron b/trustfall_core/test_data/tests/valid_queries/deep_optional.ir.ron index 449387e7..efa51a1d 100644 --- a/trustfall_core/test_data/tests/valid_queries/deep_optional.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/deep_optional.ir.ron @@ -65,21 +65,21 @@ Ok(TestIRQuery( ), }, outputs: { - "top_bottom_mult_value": ContextField( + "top_bottom_mult_value": ContextField(ContextField( vertex_id: Vid(5), field_name: "value", field_type: "Int", - ), - "top_bottom_value": ContextField( + )), + "top_bottom_value": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), - "top_value": ContextField( + )), + "top_value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/deep_optional.trace.ron b/trustfall_core/test_data/tests/valid_queries/deep_optional.trace.ron index e5355bab..61ac724d 100644 --- a/trustfall_core/test_data/tests/valid_queries/deep_optional.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/deep_optional.trace.ron @@ -1979,21 +1979,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "top_bottom_mult_value": ContextField( + "top_bottom_mult_value": ContextField(ContextField( vertex_id: Vid(5), field_name: "value", field_type: "Int", - ), - "top_bottom_value": ContextField( + )), + "top_bottom_value": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), - "top_value": ContextField( + )), + "top_value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/duplicated_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/duplicated_edge.ir.ron index cb3a2602..b2c609bb 100644 --- a/trustfall_core/test_data/tests/valid_queries/duplicated_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/duplicated_edge.ir.ron @@ -33,16 +33,16 @@ Ok(TestIRQuery( ), }, outputs: { - "one": ContextField( + "one": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "one2": ContextField( + )), + "one2": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/duplicated_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/duplicated_edge.trace.ron index 46a04a27..0c0c8098 100644 --- a/trustfall_core/test_data/tests/valid_queries/duplicated_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/duplicated_edge.trace.ron @@ -275,16 +275,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "one": ContextField( + "one": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "one2": ContextField( + )), + "one2": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/edge_parameter.ir.ron b/trustfall_core/test_data/tests/valid_queries/edge_parameter.ir.ron index ca94d0cc..cd03f297 100644 --- a/trustfall_core/test_data/tests/valid_queries/edge_parameter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/edge_parameter.ir.ron @@ -17,11 +17,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/edge_parameter.trace.ron b/trustfall_core/test_data/tests/valid_queries/edge_parameter.trace.ron index dbca526d..aaaa1d29 100644 --- a/trustfall_core/test_data/tests/valid_queries/edge_parameter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/edge_parameter.trace.ron @@ -517,11 +517,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.ir.ron b/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.ir.ron index a60c6229..5f1bcc1f 100644 --- a/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.ir.ron @@ -34,16 +34,16 @@ Ok(TestIRQuery( ), }, outputs: { - "multiple": ContextField( + "multiple": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.trace.ron b/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.trace.ron index 8599e5e4..0bacacd5 100644 --- a/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/edge_parameters_on_non_root.trace.ron @@ -609,16 +609,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "multiple": ContextField( + "multiple": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/empty_fold_output.ir.ron b/trustfall_core/test_data/tests/valid_queries/empty_fold_output.ir.ron index fc2570f2..12d80c8a 100644 --- a/trustfall_core/test_data/tests/valid_queries/empty_fold_output.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/empty_fold_output.ir.ron @@ -30,21 +30,21 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/empty_fold_output.trace.ron b/trustfall_core/test_data/tests/valid_queries/empty_fold_output.trace.ron index 16da43b9..07bb7657 100644 --- a/trustfall_core/test_data/tests/valid_queries/empty_fold_output.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/empty_fold_output.trace.ron @@ -163,21 +163,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.ir.ron b/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.ir.ron index 56246f7e..1a811235 100644 --- a/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.ir.ron @@ -52,21 +52,21 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "succ": ContextField( + "succ": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.trace.ron b/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.trace.ron index b4add80f..bed150bf 100644 --- a/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/execute_fold_before_traverse.trace.ron @@ -527,21 +527,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "succ": ContextField( + "succ": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.ir.ron b/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.ir.ron index fb78b57c..75c6be8f 100644 --- a/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.ir.ron @@ -23,21 +23,21 @@ Ok(TestIRQuery( ), }, outputs: { - "one": ContextField( + "one": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "succ_name": ContextField( + )), + "succ_name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), - "two": ContextField( + )), + "two": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.trace.ron b/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.trace.ron index f01f7efe..28ee4d4b 100644 --- a/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/explicit_output_overrides_alias.trace.ron @@ -260,21 +260,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "one": ContextField( + "one": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "succ_name": ContextField( + )), + "succ_name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), - "two": ContextField( + )), + "two": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.ir.ron index 6e68b7ca..4b4ec07b 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.ir.ron @@ -40,11 +40,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ diff --git a/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.trace.ron index 3a28ec71..387115a8 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_in_fold_using_external_tag.trace.ron @@ -410,11 +410,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ diff --git a/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.ir.ron index a8bf174d..09e655a5 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.ir.ron @@ -59,21 +59,21 @@ Ok(TestIRQuery( ), }, outputs: { - "second": ContextField( + "second": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "first": ContextField( + "first": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ diff --git a/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.trace.ron index 31c72c4d..cc8de21e 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_in_nested_fold_using_external_tag.trace.ron @@ -661,21 +661,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "second": ContextField( + "second": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "first": ContextField( + "first": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_contains.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_contains.ir.ron index 87b3fa57..bc3324b7 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_contains.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_contains.ir.ron @@ -26,16 +26,16 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "vowelsInName": ContextField( + )), + "vowelsInName": ContextField(ContextField( vertex_id: Vid(1), field_name: "vowelsInName", field_type: "[String]", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_contains.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_contains.trace.ron index 2d7025c1..336291db 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_contains.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_contains.trace.ron @@ -408,16 +408,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "vowelsInName": ContextField( + )), + "vowelsInName": ContextField(ContextField( vertex_id: Vid(1), field_name: "vowelsInName", field_type: "[String]", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.ir.ron index 899392d2..ad621326 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.ir.ron @@ -43,16 +43,16 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.trace.ron index dedaac92..8f60eeea 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_or_equal.trace.ron @@ -1382,16 +1382,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.ir.ron index 7628d68a..f0a349c0 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.ir.ron @@ -43,16 +43,16 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.trace.ron index a637f2c8..8a22475b 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_greater_than.trace.ron @@ -1284,16 +1284,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.ir.ron index 2abfde3e..47ec5336 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.trace.ron index 88a6787e..97a16d15 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_has_prefix.trace.ron @@ -503,11 +503,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.ir.ron index 29b1505c..61b83273 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.trace.ron index 00ce1b5e..c029fc7c 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_has_substring.trace.ron @@ -277,11 +277,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.ir.ron index 142a4d0f..cb51c33e 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.trace.ron index 2e910ea7..4cdd6fbe 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_has_suffix.trace.ron @@ -632,11 +632,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.ir.ron index 8bb30f6c..54a97a0c 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.trace.ron index 22c34469..31046e5f 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_less_or_equal.trace.ron @@ -183,11 +183,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.ir.ron index f0d46bdc..e98f3acb 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.trace.ron index a9201eb9..6409219f 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_less_than.trace.ron @@ -183,11 +183,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.ir.ron index 79e81837..ff19af8e 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.trace.ron index 126f9362..a8ea925b 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_not_equal.trace.ron @@ -183,11 +183,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.ir.ron index 36fd2a3c..c3f85b6c 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.trace.ron index 0b6e2767..cf60b3b6 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_one_of.trace.ron @@ -330,11 +330,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_regex.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_regex.ir.ron index 57b38834..c1519e86 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_regex.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_regex.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_op_regex.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_op_regex.trace.ron index 3d80006a..807bfe28 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_op_regex.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_op_regex.trace.ron @@ -330,11 +330,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.ir.ron index 763a3e23..dd549605 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.ir.ron @@ -23,16 +23,16 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.trace.ron index 057b9c59..a6c28088 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_with_omitted_value_arg.trace.ron @@ -1903,16 +1903,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/filter_within_fold.ir.ron b/trustfall_core/test_data/tests/valid_queries/filter_within_fold.ir.ron index 5bcbf18c..b70926b9 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_within_fold.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_within_fold.ir.ron @@ -39,11 +39,11 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/filter_within_fold.trace.ron b/trustfall_core/test_data/tests/valid_queries/filter_within_fold.trace.ron index d4829144..23e9591d 100644 --- a/trustfall_core/test_data/tests/valid_queries/filter_within_fold.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/filter_within_fold.trace.ron @@ -326,11 +326,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter.ir.ron index 545731ca..57cc9983 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter.trace.ron index 1339bb9a..1b169725 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter.trace.ron @@ -455,11 +455,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -471,11 +471,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.ir.ron index b5fff1ca..497d422d 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.trace.ron index 11ed1113..e71eeb5d 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_equals.trace.ron @@ -413,11 +413,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -429,11 +429,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.ir.ron index d87e31e0..8ce0e2a4 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.trace.ron index f6eb6036..1c108c3e 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less.trace.ron @@ -413,11 +413,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -429,11 +429,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.ir.ron index 39abf837..3260a6f1 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.trace.ron index ca00ae11..2515967f 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_less_equals.trace.ron @@ -413,11 +413,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -429,11 +429,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.ir.ron index a930864d..77538dbc 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.trace.ron index 54f4cf51..7fcba8ca 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_early_prune_max_fold_size_one_of.trace.ron @@ -413,11 +413,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -429,11 +429,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.ir.ron index 611625ad..0a3fecbd 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.trace.ron index 356fc81c..97491cd7 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_eq_with_negative_arg.trace.ron @@ -278,11 +278,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -294,11 +294,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.ir.ron index 9d078be6..3f3982cd 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.trace.ron index feb38ede..0557b657 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gt_with_negative_arg.trace.ron @@ -573,11 +573,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -589,11 +589,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.ir.ron index 8e61f5bb..bfec2fff 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.trace.ron index 5f3a98da..10512569 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_gte_with_negative_arg.trace.ron @@ -573,11 +573,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -589,11 +589,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.ir.ron index 88ed0e2d..aaf6460b 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.trace.ron index 364104a0..657e6270 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_over_i64_max.trace.ron @@ -573,11 +573,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -589,11 +589,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.ir.ron index 439033a0..451e52eb 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.trace.ron index 7bd07023..67944649 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lt_with_negative_arg.trace.ron @@ -278,11 +278,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -294,11 +294,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.ir.ron index 1efb52a2..a2dc184a 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.trace.ron index 0b1f943b..126ed95e 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_lte_with_negative_arg.trace.ron @@ -278,11 +278,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -294,11 +294,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.ir.ron index 1c15be91..e2f58522 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.trace.ron index 7c2f9fb9..a5e56d4a 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_eq_with_negative_arg.trace.ron @@ -573,11 +573,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -589,11 +589,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.ir.ron index e78bc045..5339e776 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.trace.ron index 2ccc1899..73cb787b 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_not_one_of_with_negative_arg.trace.ron @@ -573,11 +573,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -589,11 +589,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.ir.ron index 9bbf8635..ae8a35c6 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.ir.ron @@ -65,11 +65,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.trace.ron index 967f7124..5cd3d96f 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_on_a_tag.trace.ron @@ -425,11 +425,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.ir.ron index 9b3af45c..17a40573 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.trace.ron index ad6d8632..f162545d 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_one_of_with_negative_arg.trace.ron @@ -278,11 +278,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -294,11 +294,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.ir.ron index 858a25d2..185ac597 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.ir.ron @@ -45,11 +45,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.trace.ron index 02d70a85..3ade64f8 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_gt.trace.ron @@ -217,11 +217,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.ir.ron index 816bfe87..1c079c08 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.ir.ron @@ -45,11 +45,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.trace.ron index b45a8fe1..a9aa144e 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_dominated_filter_lt.trace.ron @@ -207,11 +207,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.ir.ron index 5310a310..952e5fdf 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.ir.ron @@ -45,11 +45,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.trace.ron index e4535137..d2ce4669 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_impossible_filter.trace.ron @@ -217,11 +217,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.ir.ron index 87261b7b..fd975460 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -60,11 +60,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.trace.ron index e6fb0f8d..dd14a7c4 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_filter_with_inner_filter.trace.ron @@ -465,11 +465,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -484,11 +484,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.ir.ron index 552a5722..cb5c69e7 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.ir.ron @@ -25,11 +25,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factor_numbers": ContextField( + "factor_numbers": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.trace.ron index 8a0bb7c7..7c8965ba 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_prefixed_output_name.trace.ron @@ -163,11 +163,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factor_numbers": ContextField( + "factor_numbers": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.ir.ron index 513f48d8..f9edb197 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.ir.ron @@ -50,11 +50,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.trace.ron index 4c65f274..0b74f4b3 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_explicitly_named.trace.ron @@ -337,11 +337,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.ir.ron index 36b11e12..f8e7e901 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.ir.ron @@ -79,16 +79,16 @@ Ok(TestIRQuery( ), }, outputs: { - "start": ContextField( + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "succ": ContextField( + )), + "succ": ContextField(ContextField( vertex_id: Vid(5), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.trace.ron index d8eeeb07..4140717f 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_on_nonexistent_optional.trace.ron @@ -526,16 +526,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "start": ContextField( + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "succ": ContextField( + )), + "succ": ContextField(ContextField( vertex_id: Vid(5), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.ir.ron index e02043ee..b82b265a 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.ir.ron @@ -60,11 +60,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.trace.ron index f8f5c0be..b91be272 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_count_tag_used_inside_sibling_fold.trace.ron @@ -379,11 +379,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_directive.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_directive.ir.ron index 6f7e73cc..3a682e10 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_directive.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_directive.ir.ron @@ -30,11 +30,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_directive.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_directive.trace.ron index 45437ef9..58465b60 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_directive.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_directive.trace.ron @@ -213,11 +213,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.ir.ron index a987218d..e803eb34 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.ir.ron @@ -47,11 +47,11 @@ Ok(TestIRQuery( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -71,11 +71,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.trace.ron index 0c9d5ab5..6c10a18b 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_both_count_and_nested_filter_dependent_on_tag.trace.ron @@ -546,11 +546,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -570,11 +570,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.ir.ron index 50a243fa..c15997ad 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.ir.ron @@ -46,11 +46,11 @@ Ok(TestIRQuery( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -62,11 +62,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.trace.ron index 271526b9..131220c1 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter.trace.ron @@ -349,11 +349,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -365,11 +365,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.ir.ron index 0141af2e..196c0263 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.ir.ron @@ -47,11 +47,11 @@ Ok(TestIRQuery( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -70,11 +70,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.trace.ron index df949697..6486625c 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_count_filter_and_nested_filter_with_tag.trace.ron @@ -453,11 +453,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -476,11 +476,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.ir.ron index 4eba295d..5146f9ad 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.ir.ron @@ -46,11 +46,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.trace.ron index f1dda1b4..0ecc1d9b 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter.trace.ron @@ -271,11 +271,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.ir.ron index 5e3ab52a..42b6384f 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.ir.ron @@ -47,11 +47,11 @@ Ok(TestIRQuery( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -64,11 +64,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.trace.ron index aa3988d0..09083f32 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_nested_filter_and_tag.trace.ron @@ -453,11 +453,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "inner": ContextField( + "inner": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -470,11 +470,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.ir.ron index 46386800..83fb88e2 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.ir.ron @@ -44,11 +44,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.trace.ron index ab17ae1a..cf18fb99 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_output.trace.ron @@ -315,11 +315,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.ir.ron index 94bb473e..f608c07e 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.ir.ron @@ -63,16 +63,16 @@ Ok(TestIRQuery( ), }, outputs: { - "composite_value": ContextField( + "composite_value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "prime_factors": ContextField( + )), + "prime_factors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.trace.ron index da69396c..a4ca19a6 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_inner_output_with_count_tag.trace.ron @@ -1166,16 +1166,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "composite_value": ContextField( + "composite_value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "prime_factors": ContextField( + )), + "prime_factors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.ir.ron index 394a706e..55f345dd 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.trace.ron index 2c56bda8..ad4f66eb 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs.trace.ron @@ -283,11 +283,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.ir.ron index 394a706e..55f345dd 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.trace.ron index 2c56bda8..ad4f66eb 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_elided_braces.trace.ron @@ -283,11 +283,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.ir.ron index b1659963..8cee37a0 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.trace.ron index 22223938..a311def1 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_greater_than.trace.ron @@ -283,11 +283,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.ir.ron index 938dadc1..613889d0 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.trace.ron index 17ca7270..be52bb09 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_less_than.trace.ron @@ -364,11 +364,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.ir.ron index 22732dc4..a8a0d075 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.trace.ron index d6204a1a..2c3ae9b1 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_no_outputs_transform_and_filter_one_of.trace.ron @@ -203,11 +203,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.ir.ron index 57e26b6c..943139c4 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.ir.ron @@ -38,16 +38,16 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.trace.ron index ee086a87..a7f7d7e3 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_nonexistent_optional.trace.ron @@ -273,16 +273,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.ir.ron index 24942dca..8e59a212 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.trace.ron index bb1cf001..87946321 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_greater_than.trace.ron @@ -410,11 +410,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -426,11 +426,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.ir.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.ir.ron index 57405b25..a6925573 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -48,11 +48,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.trace.ron b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.trace.ron index ba793b62..1ae89fad 100644 --- a/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/fold_with_outputs_transform_and_filter_less_than.trace.ron @@ -194,11 +194,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "prime": ContextField( + "prime": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), post_filters: [ @@ -210,11 +210,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.ir.ron index 9b936fec..854bc967 100644 --- a/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.ir.ron @@ -59,11 +59,11 @@ Ok(TestIRQuery( ), }, outputs: { - "second": ContextField( + "second": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -76,11 +76,11 @@ Ok(TestIRQuery( ), }, outputs: { - "first": ContextField( + "first": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.trace.ron index 43b4f781..25bca7cb 100644 --- a/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/folded_filter_in_fold_using_external_tag.trace.ron @@ -557,11 +557,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "second": ContextField( + "second": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -574,11 +574,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "first": ContextField( + "first": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.ir.ron b/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.ir.ron index f34cb5d1..d68a1a6e 100644 --- a/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.ir.ron @@ -34,16 +34,16 @@ Ok(TestIRQuery( ), }, outputs: { - "base": ContextField( + "base": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.trace.ron b/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.trace.ron index d6a09a59..b53413a0 100644 --- a/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/implicit_coercion_in_recurse_to_supertype.trace.ron @@ -2501,16 +2501,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "base": ContextField( + "base": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.ir.ron b/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.ir.ron index ba3f9a89..b1006684 100644 --- a/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.ir.ron @@ -17,11 +17,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.trace.ron b/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.trace.ron index 79253635..9cd28ba9 100644 --- a/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/implicit_null_for_nullable_edge_parameter.trace.ron @@ -124,11 +124,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.ir.ron b/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.ir.ron index bf72ece4..9ba8c79e 100644 --- a/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.ir.ron @@ -33,16 +33,16 @@ Ok(TestIRQuery( ), }, outputs: { - "successor_value": ContextField( + "successor_value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.trace.ron b/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.trace.ron index 1e0ae743..5a169cf9 100644 --- a/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/implicit_tag_and_output_names.trace.ron @@ -316,16 +316,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "successor_value": ContextField( + "successor_value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.ir.ron b/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.ir.ron index 45026a65..7d1738df 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.ir.ron @@ -37,11 +37,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.trace.ron b/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.trace.ron index e089ed4a..307c7dad 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_copies_of_field.trace.ron @@ -266,11 +266,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.ir.ron b/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.ir.ron index be72a741..e38c52fd 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -62,11 +62,11 @@ Ok(TestIRQuery( ), }, outputs: { - "multiples": ContextField( + "multiples": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -75,11 +75,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.trace.ron b/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.trace.ron index e261b2c8..f9822420 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_fold_count_outputs.trace.ron @@ -714,11 +714,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -744,11 +744,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "multiples": ContextField( + "multiples": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -757,11 +757,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.ir.ron b/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.ir.ron index dbc3e61f..850c79a5 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.ir.ron @@ -30,16 +30,16 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.trace.ron b/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.trace.ron index 98d8ea4d..3579bb51 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_fold_outputs.trace.ron @@ -580,16 +580,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_folds.ir.ron b/trustfall_core/test_data/tests/valid_queries/multiple_folds.ir.ron index e097f49e..04b5511d 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_folds.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_folds.ir.ron @@ -30,11 +30,11 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), @@ -52,21 +52,21 @@ Ok(TestIRQuery( ), }, outputs: { - "div": ContextField( + "div": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/multiple_folds.trace.ron b/trustfall_core/test_data/tests/valid_queries/multiple_folds.trace.ron index 8e228e5d..fe824e1f 100644 --- a/trustfall_core/test_data/tests/valid_queries/multiple_folds.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/multiple_folds.trace.ron @@ -570,11 +570,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), @@ -592,21 +592,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "div": ContextField( + "div": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nested_fold.ir.ron b/trustfall_core/test_data/tests/valid_queries/nested_fold.ir.ron index 0f4f6fdd..fe48daaf 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_fold.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_fold.ir.ron @@ -55,31 +55,31 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "base": ContextField( + "base": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nested_fold.trace.ron b/trustfall_core/test_data/tests/valid_queries/nested_fold.trace.ron index cafc8186..f9480774 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_fold.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_fold.trace.ron @@ -3884,31 +3884,31 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "base": ContextField( + "base": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.ir.ron b/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.ir.ron index d8446dda..c2c77620 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.ir.ron @@ -51,11 +51,11 @@ Ok(TestIRQuery( ), }, outputs: { - "multiples": ContextField( + "multiples": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -64,11 +64,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -77,11 +77,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.trace.ron b/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.trace.ron index ee57c119..3ca0e131 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_fold_count_output.trace.ron @@ -972,11 +972,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "multiples": ContextField( + "multiples": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -985,11 +985,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -998,11 +998,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.ir.ron b/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.ir.ron index 2980e9ac..2173ae02 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.ir.ron @@ -65,11 +65,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.trace.ron b/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.trace.ron index 2c9246d1..00fcc6c9 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_fold_with_no_outputs.trace.ron @@ -567,11 +567,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/nested_query.ir.ron b/trustfall_core/test_data/tests/valid_queries/nested_query.ir.ron index 65cb28ed..b5012c32 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_query.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_query.ir.ron @@ -29,16 +29,16 @@ Ok(TestIRQuery( ), }, outputs: { - "successor": ContextField( + "successor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nested_query.trace.ron b/trustfall_core/test_data/tests/valid_queries/nested_query.trace.ron index f4e4cdd6..2c55b385 100644 --- a/trustfall_core/test_data/tests/valid_queries/nested_query.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/nested_query.trace.ron @@ -548,16 +548,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "successor": ContextField( + "successor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/no_op_fragment.ir.ron b/trustfall_core/test_data/tests/valid_queries/no_op_fragment.ir.ron index 1bfa85c7..43455141 100644 --- a/trustfall_core/test_data/tests/valid_queries/no_op_fragment.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/no_op_fragment.ir.ron @@ -23,11 +23,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/no_op_fragment.trace.ron b/trustfall_core/test_data/tests/valid_queries/no_op_fragment.trace.ron index 0ebf5789..f9c82b54 100644 --- a/trustfall_core/test_data/tests/valid_queries/no_op_fragment.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/no_op_fragment.trace.ron @@ -150,11 +150,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.ir.ron b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.ir.ron index 17b9906a..f7d46bae 100644 --- a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.ir.ron @@ -38,11 +38,11 @@ Ok(TestIRQuery( ), }, outputs: { - "successors": ContextField( + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -51,16 +51,16 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.trace.ron b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.trace.ron index 515550dc..a8d2d15b 100644 --- a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_fold.trace.ron @@ -291,11 +291,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "successors": ContextField( + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -304,16 +304,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.ir.ron b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.ir.ron index 73fd0d32..8d37c6a8 100644 --- a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.ir.ron @@ -35,21 +35,21 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "successors": ContextField( + )), + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.trace.ron b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.trace.ron index 21a156cb..4e7a499c 100644 --- a/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/nonexistent_optional_with_nested_optional.trace.ron @@ -325,21 +325,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "successors": ContextField( + )), + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), - "zero": ContextField( + )), + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_directive.ir.ron b/trustfall_core/test_data/tests/valid_queries/optional_directive.ir.ron index fdbd62f6..bf2ffae6 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_directive.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_directive.ir.ron @@ -35,16 +35,16 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_directive.trace.ron b/trustfall_core/test_data/tests/valid_queries/optional_directive.trace.ron index ff16a04a..446e4579 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_directive.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_directive.trace.ron @@ -1095,16 +1095,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.ir.ron index 9afd1cd9..d8695e7f 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.ir.ron @@ -43,11 +43,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.trace.ron index 49b634b5..3d60d378 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_and_filter.trace.ron @@ -240,11 +240,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.ir.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.ir.ron index 6603c248..6003538c 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.ir.ron @@ -44,11 +44,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.trace.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.trace.ron index 93642d23..6d53a8a4 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_edge_with_filter_and_tag.trace.ron @@ -300,11 +300,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.ir.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.ir.ron index 8dab8804..f524fb38 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.ir.ron @@ -33,16 +33,16 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.trace.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.trace.ron index f4282d6a..b33170d9 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_semantics.trace.ron @@ -191,16 +191,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.ir.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.ir.ron index 90d81b64..63fffc12 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.ir.ron @@ -34,16 +34,16 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.trace.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.trace.ron index 5e72d04e..4eefb794 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_filter_with_tag_semantics.trace.ron @@ -249,16 +249,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.ir.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.ir.ron index 9c6fec8e..22cd3876 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.ir.ron @@ -34,11 +34,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.trace.ron b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.trace.ron index e0344636..599f1aeb 100644 --- a/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/optional_with_nested_required_edge_semantics.trace.ron @@ -179,11 +179,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/output_fold_count.ir.ron b/trustfall_core/test_data/tests/valid_queries/output_fold_count.ir.ron index b9420919..d84dfbef 100644 --- a/trustfall_core/test_data/tests/valid_queries/output_fold_count.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/output_fold_count.ir.ron @@ -25,11 +25,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -38,11 +38,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/output_fold_count.trace.ron b/trustfall_core/test_data/tests/valid_queries/output_fold_count.trace.ron index 924cea93..900641e6 100644 --- a/trustfall_core/test_data/tests/valid_queries/output_fold_count.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/output_fold_count.trace.ron @@ -249,11 +249,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -262,11 +262,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.ir.ron b/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.ir.ron index 5ed41887..ea14bcbb 100644 --- a/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.ir.ron @@ -32,11 +32,11 @@ Ok(TestIRQuery( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -45,11 +45,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.trace.ron b/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.trace.ron index c9f0f1c1..6409ca6e 100644 --- a/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/output_fold_count_multiple.trace.ron @@ -913,11 +913,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "factors": ContextField( + "factors": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -926,11 +926,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.ir.ron b/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.ir.ron index 21d4d4ed..39e9a463 100644 --- a/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.ir.ron @@ -36,21 +36,21 @@ Ok(TestIRQuery( ), }, outputs: { - "multiple": ContextField( + "multiple": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.trace.ron b/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.trace.ron index 8d1ce1cd..8caea71e 100644 --- a/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/outputs_both_inside_and_outside_fold.trace.ron @@ -649,21 +649,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "multiple": ContextField( + "multiple": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.ir.ron index b810af81..7badd3c3 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.ir.ron @@ -47,21 +47,21 @@ Ok(TestIRQuery( ), }, outputs: { - "base": ContextField( + "base": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "mult": ContextField( + )), + "mult": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.trace.ron index 9fa858f2..38d60fb1 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_and_traverse.trace.ron @@ -4132,21 +4132,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "base": ContextField( + "base": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "mult": ContextField( + )), + "mult": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_directive.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_directive.ir.ron index ff02a351..1a981003 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_directive.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_directive.ir.ron @@ -32,16 +32,16 @@ Ok(TestIRQuery( ), }, outputs: { - "next": ContextField( + "next": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_directive.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_directive.trace.ron index 282e4a3a..22c7609f 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_directive.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_directive.trace.ron @@ -2012,16 +2012,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "next": ContextField( + "next": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "value": ContextField( + )), + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.ir.ron index 30d859dc..ce24f8fe 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.ir.ron @@ -31,11 +31,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.trace.ron index 7ab1f839..02688fad 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_on_parameterized_edge.trace.ron @@ -1305,11 +1305,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.ir.ron index 821f63a4..4c903374 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.trace.ron index c66f3606..5f8980c9 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_one.trace.ron @@ -737,11 +737,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.ir.ron index cc3386b8..5d98c004 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.trace.ron index 28fdff7d..7c923c10 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_depth_two.trace.ron @@ -1340,11 +1340,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.ir.ron index 8c3fa748..bb92bffd 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.trace.ron index d80cff00..979a7826 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_intermediate.trace.ron @@ -2091,11 +2091,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.ir.ron index 4a1301ba..73fd0e7b 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.ir.ron @@ -41,11 +41,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.trace.ron index 5daa0460..64b03d69 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_leaves.trace.ron @@ -1991,11 +1991,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.ir.ron index 4d314f9e..9b68d8d7 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.ir.ron @@ -42,11 +42,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.trace.ron index a074486d..50ce2a73 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_one.trace.ron @@ -1414,11 +1414,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.ir.ron index 8e8b2879..8d397edb 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.ir.ron @@ -42,11 +42,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.trace.ron index 46dca3f4..a2743355 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_filter_on_tag_depth_two.trace.ron @@ -2435,11 +2435,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.ir.ron index 75fdea17..c16b388a 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.ir.ron @@ -46,11 +46,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.trace.ron index 5e734933..c3d9783c 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_nested_required_edge_depth_two.trace.ron @@ -616,11 +616,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.ir.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.ir.ron index 08f1c1af..e9040760 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.ir.ron @@ -36,11 +36,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.trace.ron b/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.trace.ron index 2caf33ab..b1d15df8 100644 --- a/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/recurse_then_required_edge_depth_one.trace.ron @@ -295,11 +295,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/required_properties.ir.ron b/trustfall_core/test_data/tests/valid_queries/required_properties.ir.ron index 00e48bd1..f730ac8b 100644 --- a/trustfall_core/test_data/tests/valid_queries/required_properties.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/required_properties.ir.ron @@ -67,21 +67,21 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/required_properties.trace.ron b/trustfall_core/test_data/tests/valid_queries/required_properties.trace.ron index 5369b197..019b6b19 100644 --- a/trustfall_core/test_data/tests/valid_queries/required_properties.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/required_properties.trace.ron @@ -950,21 +950,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(2), field_name: "name", field_type: "String", - ), + )), }, ), ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.ir.ron b/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.ir.ron index a0840d39..1985e90e 100644 --- a/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.ir.ron @@ -33,16 +33,16 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "vowelsInName": ContextField( + )), + "vowelsInName": ContextField(ContextField( vertex_id: Vid(1), field_name: "vowelsInName", field_type: "[String]", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.trace.ron b/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.trace.ron index b218c001..d34153dc 100644 --- a/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/required_properties_filter_and_output.trace.ron @@ -199,16 +199,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "vowelsInName": ContextField( + )), + "vowelsInName": ContextField(ContextField( vertex_id: Vid(1), field_name: "vowelsInName", field_type: "[String]", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/root_coercion.ir.ron b/trustfall_core/test_data/tests/valid_queries/root_coercion.ir.ron index cddbd900..37d5593c 100644 --- a/trustfall_core/test_data/tests/valid_queries/root_coercion.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/root_coercion.ir.ron @@ -18,11 +18,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/root_coercion.trace.ron b/trustfall_core/test_data/tests/valid_queries/root_coercion.trace.ron index ef4bcc4e..1cb5ed46 100644 --- a/trustfall_core/test_data/tests/valid_queries/root_coercion.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/root_coercion.trace.ron @@ -521,11 +521,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/simple_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/simple_filter.ir.ron index 9e73c709..8aed2d46 100644 --- a/trustfall_core/test_data/tests/valid_queries/simple_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/simple_filter.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "number_name": ContextField( + "number_name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/simple_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/simple_filter.trace.ron index 686ba03d..3f3b4169 100644 --- a/trustfall_core/test_data/tests/valid_queries/simple_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/simple_filter.trace.ron @@ -215,11 +215,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "number_name": ContextField( + "number_name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/simple_query.ir.ron b/trustfall_core/test_data/tests/valid_queries/simple_query.ir.ron index 811259d0..39131796 100644 --- a/trustfall_core/test_data/tests/valid_queries/simple_query.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/simple_query.ir.ron @@ -17,11 +17,11 @@ Ok(TestIRQuery( ), }, outputs: { - "number_name": ContextField( + "number_name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/simple_query.trace.ron b/trustfall_core/test_data/tests/valid_queries/simple_query.trace.ron index ea42ef5f..bcbf3e3d 100644 --- a/trustfall_core/test_data/tests/valid_queries/simple_query.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/simple_query.trace.ron @@ -198,11 +198,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "number_name": ContextField( + "number_name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.ir.ron index 9631a7ef..bf43bce9 100644 --- a/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.ir.ron @@ -46,11 +46,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.trace.ron index 2b41c34d..55993630 100644 --- a/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/static_and_dynamic_filter.trace.ron @@ -533,11 +533,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.ir.ron b/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.ir.ron index 9683910c..f4b5570b 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.ir.ron @@ -64,16 +64,16 @@ Ok(TestIRQuery( ), }, outputs: { - "start": ContextField( + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "target": ContextField( + )), + "target": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.trace.ron b/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.trace.ron index 38405be6..dec823eb 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_and_filter_directives.trace.ron @@ -1119,16 +1119,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "start": ContextField( + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "target": ContextField( + )), + "target": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.ir.ron b/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.ir.ron index 3d57a840..d1d6e6f2 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.ir.ron @@ -21,11 +21,11 @@ Ok(TestIRQuery( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.trace.ron b/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.trace.ron index 38b736db..73ed08d1 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_before_filter_in_same_scope.trace.ron @@ -156,11 +156,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "name": ContextField( + "name": ContextField(ContextField( vertex_id: Vid(1), field_name: "name", field_type: "String", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.ir.ron b/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.ir.ron index f29088f0..fb545301 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.ir.ron @@ -59,16 +59,16 @@ Ok(TestIRQuery( ), }, outputs: { - "m1_value": ContextField( + "m1_value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "m2_value": ContextField( + )), + "m2_value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.trace.ron b/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.trace.ron index 9c299deb..d0f4233b 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_name_in_prefixed_vertex.trace.ron @@ -1636,16 +1636,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "m1_value": ContextField( + "m1_value": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "m2_value": ContextField( + )), + "m2_value": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.ir.ron b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.ir.ron index 2c96a8a4..55faa0b7 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.ir.ron @@ -104,21 +104,21 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "start": ContextField( + )), + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "succ": ContextField( + )), + "succ": ContextField(ContextField( vertex_id: Vid(7), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.trace.ron b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.trace.ron index 5274b433..9d064e15 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional.trace.ron @@ -2207,21 +2207,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "start": ContextField( + )), + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), - "succ": ContextField( + )), + "succ": ContextField(ContextField( vertex_id: Vid(7), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.ir.ron b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.ir.ron index 2a89476e..48f07923 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.ir.ron @@ -108,11 +108,11 @@ Ok(TestIRQuery( ), }, outputs: { - "succ": ContextField( + "succ": ContextField(ContextField( vertex_id: Vid(7), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -125,16 +125,16 @@ Ok(TestIRQuery( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "start": ContextField( + )), + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.trace.ron b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.trace.ron index 4bc2eb55..6d71524e 100644 --- a/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/tag_within_non_existent_optional_used_in_fold.trace.ron @@ -2509,11 +2509,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "succ": ContextField( + "succ": ContextField(ContextField( vertex_id: Vid(7), field_name: "value", field_type: "Int", - ), + )), }, ), imported_tags: [ @@ -2526,16 +2526,16 @@ TestInterpreterOutputTrace( ), }, outputs: { - "mult": ContextField( + "mult": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "start": ContextField( + )), + "start": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/typename_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/typename_filter.ir.ron index 0b1213fc..d811978b 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_filter.ir.ron @@ -26,11 +26,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/typename_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/typename_filter.trace.ron index 49b2518d..5415aefa 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_filter.trace.ron @@ -163,11 +163,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), variables: { diff --git a/trustfall_core/test_data/tests/valid_queries/typename_output.ir.ron b/trustfall_core/test_data/tests/valid_queries/typename_output.ir.ron index f14affc9..c96ea4df 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_output.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_output.ir.ron @@ -11,11 +11,11 @@ Ok(TestIRQuery( ), }, outputs: { - "__typename": ContextField( + "__typename": ContextField(ContextField( vertex_id: Vid(1), field_name: "__typename", field_type: "String!", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/typename_output.trace.ron b/trustfall_core/test_data/tests/valid_queries/typename_output.trace.ron index 661b7061..19c2b681 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_output.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_output.trace.ron @@ -81,11 +81,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "__typename": ContextField( + "__typename": ContextField(ContextField( vertex_id: Vid(1), field_name: "__typename", field_type: "String!", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.ir.ron b/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.ir.ron index 0772dc72..e18f1b8b 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.ir.ron @@ -11,11 +11,11 @@ Ok(TestIRQuery( ), }, outputs: { - "__typename": ContextField( + "__typename": ContextField(ContextField( vertex_id: Vid(1), field_name: "__typename", field_type: "String!", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.trace.ron b/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.trace.ron index f44bd7ea..fc76e41d 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_output_on_final_type.trace.ron @@ -81,11 +81,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "__typename": ContextField( + "__typename": ContextField(ContextField( vertex_id: Vid(1), field_name: "__typename", field_type: "String!", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.ir.ron b/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.ir.ron index fb431edc..2b6fc733 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.ir.ron @@ -39,11 +39,11 @@ Ok(TestIRQuery( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.trace.ron b/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.trace.ron index 3a10ea8e..f5c9ef62 100644 --- a/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/typename_tag_and_filter.trace.ron @@ -370,11 +370,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "value": ContextField( + "value": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.ir.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.ir.ron index 339908f1..3b44d4f5 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.ir.ron @@ -53,11 +53,11 @@ Ok(TestIRQuery( ), }, outputs: { - "next_successors": ContextField( + "next_successors": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -66,11 +66,11 @@ Ok(TestIRQuery( ), }, outputs: { - "successors": ContextField( + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -79,21 +79,21 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.trace.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.trace.ron index c101e17b..f3af8d71 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_doubly_nested_folds.trace.ron @@ -218,11 +218,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "next_successors": ContextField( + "next_successors": ContextField(ContextField( vertex_id: Vid(4), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -231,11 +231,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "successors": ContextField( + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -244,21 +244,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.ir.ron index a83f62c7..e6efee4c 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.ir.ron @@ -37,26 +37,26 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "successors": ContextField( + )), + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.trace.ron index ebb5aeb4..0d6788c9 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_edge.trace.ron @@ -193,26 +193,26 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "successors": ContextField( + )), + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.ir.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.ir.ron index 2b965582..8cd34a31 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.ir.ron @@ -39,11 +39,11 @@ Ok(TestIRQuery( ), }, outputs: { - "successors": ContextField( + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -52,21 +52,21 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.trace.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.trace.ron index a74bb5d9..5e53dbae 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_fold.trace.ron @@ -198,11 +198,11 @@ TestInterpreterOutputTrace( ), }, outputs: { - "successors": ContextField( + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), fold_specific_outputs: { @@ -211,21 +211,21 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.ir.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.ir.ron index f501b04a..47e4345b 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.ir.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.ir.ron @@ -38,26 +38,26 @@ Ok(TestIRQuery( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "successors": ContextField( + )), + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ), diff --git a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.trace.ron b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.trace.ron index 0b5341ea..c5c3ec30 100644 --- a/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.trace.ron +++ b/trustfall_core/test_data/tests/valid_queries/zero_element_fold_with_nested_optional_edge.trace.ron @@ -194,26 +194,26 @@ TestInterpreterOutputTrace( ), }, outputs: { - "predecessor": ContextField( + "predecessor": ContextField(ContextField( vertex_id: Vid(2), field_name: "value", field_type: "Int", - ), - "successors": ContextField( + )), + "successors": ContextField(ContextField( vertex_id: Vid(3), field_name: "value", field_type: "Int", - ), + )), }, ), ), }, outputs: { - "zero": ContextField( + "zero": ContextField(ContextField( vertex_id: Vid(1), field_name: "value", field_type: "Int", - ), + )), }, ), ),