Add AVERAGEIF, COUNTIF, SUMIF, and COUNTBLANK (#492)

quadratichq · Jun 15, 2023 · 9d87209 · 9d87209 · vercel · Jun 15, 2023
1 parent 7107338
commit 9d87209
Show file tree

Hide file tree

Showing 18 changed files with 862 additions and 121 deletions.
diff --git a/quadratic-core/Cargo.toml b/quadratic-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "quadratic-core"
-version = "0.1.8"
+version = "0.1.9"
 authors = ["Andrew Farkas <andrew.farkas@quadratic.to>"]
 edition = "2021"
 description = "Infinite data grid with Python, JavaScript, and SQL built-in"

diff --git a/quadratic-core/src/formulas/ast.rs b/quadratic-core/src/formulas/ast.rs
@@ -90,13 +90,16 @@ impl Formula {
     /// Evaluates a formula, blocking on async calls.
     ///
     /// Use this when the grid proxy isn't actually doing anything async.
-    pub fn eval_blocking(&self, grid: &mut dyn GridProxy, pos: Pos) -> FormulaResult {
+    pub fn eval_blocking(&self, grid: &mut dyn GridProxy, pos: Pos) -> FormulaResult<Value> {
         pollster::block_on(self.eval(grid, pos))
     }
 
     /// Evaluates a formula.
-    pub async fn eval(&self, grid: &mut dyn GridProxy, pos: Pos) -> FormulaResult {
-        self.ast.eval(&mut Ctx { grid, pos }).await
+    pub async fn eval(&self, grid: &mut dyn GridProxy, pos: Pos) -> FormulaResult<Value> {
+        self.ast
+            .eval(&mut Ctx { grid, pos })
+            .await?
+            .into_non_error_value()
     }
 }