Fix regression of reduce statement

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "poe_query"
-version = "0.1.15"
+version = "0.1.16"
 authors = ["Daniel <daniel@timeloop.se>"]
 edition = "2021"
 

src/dat/file.rs

@@ -59,7 +59,7 @@ impl DatFile {
     }
 
     pub fn valid(&self, spec: &FileSpec) {
-        info!("Validating using specification '{}'", spec);
+        debug!("Validating using specification '{}'", spec);
         let last_field = spec.file_fields.last();
         if let Some(field) = last_field {
             let spec_row_size = field.field_offset + FileSpec::field_size(field);

src/query/grammar.pest

@@ -63,7 +63,6 @@ kv_by_field = { identifier }
 construct = _{ array_construction | object_construct }
 array_construction = { "[" ~ query* ~ "]" }
 
-
 // OBJECT CONSTRUCTION
 object_construct = { "{" ~ ((key_value | kv_by_field) ~ comma?)* ~ "}" }
 key_value = { key ~ (!("," ~ &key) ~ query)+ }

src/query/mod.rs

@@ -340,7 +340,7 @@ fn to_term(pair: pest::iterators::Pair<Rule>) -> Term {
                         };
                         initial.append(&mut build_ast(inner_next));
                     }
-                    _ => current.append(&mut build_ast(next.into_inner().next().unwrap()))
+                   _ => current.append(&mut build_ast(next))
                 }
             }
             Term::Reduce(outer_terms, initial, inner_terms)

src/traversal/traverse.rs

@@ -204,10 +204,13 @@ impl<'a> DataTraverser<'a> for StaticContext<'a> {
 
 
                     let initial = self.traverse_terms_inner(&mut context.clone_value(None), cache, init);
-                    let variable = vars.first().unwrap().as_str();
+                    let Some(variable) = vars.first() else {
+                      return None;
+                    };
+
                     let value = cache
                         .variables
-                        .get(variable)
+                        .get(variable.as_str())
                         .unwrap_or(&Value::Empty)
                         .clone();
 

tests/misc.rs

@@ -28,3 +28,12 @@ fn field() {
     assert_eq!(result, vec!["2"]);
 }
 
+#[test]
+fn reduce() {
+    let result = process(r#"[
+    { "ring": 1000 },
+    { "default": 1000 }
+    ] | reduce .[] as $item ({}; . + $item)"#);
+
+    assert_eq!(result, vec![r#"{"ring":1000,"default":1000}"#]);
+}