implement filter qualifiers

suaviloquence · Jul 16, 2024 · 26fd392 · 26fd392
1 parent 15e9855
commit 26fd392
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 5 deletions.
diff --git a/examples/inputs/qualifiers.html b/examples/inputs/qualifiers.html
@@ -0,0 +1,15 @@
+<!doctype html>
+
+<html>
+    <body>
+        <ul>
+            <li>Hello! 1</li>
+            <li><span class="special">special!</span>Hello! 2</li>
+            <li>Hello! 3</li>
+            <li>Hello! 4</li>
+            <li>Hello! 5</li>
+            <li>Hello! 6</li>
+            <li>Hello! 7</li>
+        </ul>
+    </body>
+</html>
diff --git a/examples/outputs/qualifiers.json b/examples/outputs/qualifiers.json
@@ -0,0 +1,45 @@
+{
+  "items": [
+    {
+      "special": null,
+      "txt": "Hello! 1"
+    },
+    {
+      "special": "special!",
+      "txt": "Hello! 2"
+    },
+    {
+      "special": null,
+      "txt": "Hello! 3"
+    },
+    {
+      "special": null,
+      "txt": "Hello! 4"
+    },
+    {
+      "special": null,
+      "txt": "Hello! 5"
+    },
+    {
+      "special": null,
+      "txt": "Hello! 6"
+    },
+    {
+      "special": null,
+      "txt": "Hello! 7"
+    }
+  ],
+  "sixth": {
+    "special": null,
+    "txt": "Hello! 6"
+  },
+  "specials": [
+    null,
+    "special!",
+    null,
+    null,
+    null,
+    null,
+    null
+  ]
+}
diff --git a/examples/scrps/qualifiers.scrp b/examples/scrps/qualifiers.scrp
@@ -0,0 +1,7 @@
+items: li {
+    special: .special { txt: $text; }? | take(key: "txt")?;
+    txt: $text;
+}*;
+
+specials: $items | take(key: "special")*;
+sixth: $items | nth(i: 5);
diff --git a/src/frontend/parser.rs b/src/frontend/parser.rs
@@ -88,7 +88,9 @@ impl<'a> Parser<'a> {
         let lx = self.scanner.peek_non_whitespace();
 
         match lx.token {
-            Token::Id | Token::Less => self.parse_element().map(RValue::Element),
+            Token::Id | Token::Less | Token::Dot | Token::Hash => {
+                self.parse_element().map(RValue::Element)
+            }
             _ => self.parse_leaf().map(RValue::Leaf),
         }
     }

diff --git a/src/interpreter/filter.rs b/src/interpreter/filter.rs
@@ -139,7 +139,7 @@ fn float<'doc>(value: PValue<'doc>) -> anyhow::Result<PValue<'doc>> {
 fn nth<'doc>(mut value: ListIter<'doc>, i: i64) -> anyhow::Result<PValue<'doc>> {
     match value.nth(i.try_into().context("negative indices are not supported")?) {
         Some(x) => Ok(x),
-        None => anyhow::bail!(""),
+        None => anyhow::bail!("No element at index {i}"),
     }
 }
 

diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs
@@ -4,10 +4,10 @@ use anyhow::Context;
 use execution_mode::ExecutionMode;
 use reqwest::IntoUrl;
 
-use value::EValue;
+use value::{EValue, ListIter};
 
 use crate::frontend::{
-    ast::{AstRef, Element, FilterList, Inline, Leaf, RValue, Statement, StatementList},
+    ast::{AstRef, Element, FilterList, Inline, Leaf, Qualifier, RValue, Statement, StatementList},
     AstArena,
 };
 
@@ -233,7 +233,16 @@ impl<'ast> Interpreter<'ast> {
                     .map(|arg| Ok((arg.id, ctx.leaf_to_value(&arg.value)?)))
                     .collect::<Result<BTreeMap<_, _>>>()?;
 
-                filter::dispatch_filter(filter.id, value, args, ctx)
+                match filter.qualifier {
+                    Qualifier::One => filter::dispatch_filter(filter.id, value, args, ctx),
+                    Qualifier::Optional if matches!(value, Value::Null) => Ok(Value::Null),
+                    Qualifier::Optional => filter::dispatch_filter(filter.id, value, args, ctx),
+                    Qualifier::Collection => value
+                        .try_unwrap::<ListIter>()?
+                        .map(|value| filter::dispatch_filter(filter.id, value, args.clone(), ctx))
+                        .collect::<Result<Vec<_>>>()
+                        .map(Value::List),
+                }
             })
             .map(EValue::from)
     }
@@ -408,5 +417,6 @@ mod tests {
     integration_test! {
         abc,
         attr,
+        qualifiers,
     }
 }