fix: Handle 'date' time unit in timeOffset function properly (#17)

Author: OlegWock

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "vegafusion-common"
-version = "2.0.7"
+version = "2.0.8"
 edition = "2021"
 description = "Common components required by multiple VegaFusion crates"
 license = "BSD-3-Clause"

vegafusion-common/Cargo.toml

@@ -2,7 +2,7 @@
 name = "vegafusion-core"
 license = "BSD-3-Clause"
 edition = "2021"
-version = "2.0.7"
+version = "2.0.8"
 description = "Core components required by multiple VegaFusion crates, with WASM compatibility"
 
 [features]
@@ -48,7 +48,7 @@ workspace = true
 [dependencies.vegafusion-common]
 path = "../vegafusion-common"
 features = ["json", "sqlparser"]
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.datafusion-common]
 workspace = true

vegafusion-core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "vegafusion"
 license = "BSD-3-Clause"
 edition = "2021"
-version = "2.0.7"
+version = "2.0.8"
 description = "VegaFusion Python interface"
 
 [lib]
@@ -52,16 +52,16 @@ workspace = true
 [dependencies.vegafusion-common]
 path = "../vegafusion-common"
 features = ["pyo3", "base64"]
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.vegafusion-core]
 path = "../vegafusion-core"
 features = ["py", "tonic_support"]
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.vegafusion-runtime]
 path = "../vegafusion-runtime"
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.datafusion]
 workspace = true

vegafusion-python/Cargo.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deepnote_vegafusion"
-version = "2.0.7"
+version = "2.0.8"
 description = "Core tools for using VegaFusion from Python"
 readme = "README.md"
 requires-python = ">=3.9"

vegafusion-python/pyproject.toml

@@ -6,7 +6,7 @@ harness = false
 name = "vegafusion-runtime"
 license = "BSD-3-Clause"
 edition = "2021"
-version = "2.0.7"
+version = "2.0.8"
 description = "VegaFusion Runtime"
 
 [features]
@@ -115,12 +115,12 @@ workspace = true
 [dependencies.vegafusion-common]
 path = "../vegafusion-common"
 features = ["json", "sqlparser", "prettyprint", "object_store", "url"]
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.vegafusion-core]
 path = "../vegafusion-core"
 features = ["sqlparser"]
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.serde]
 workspace = true

vegafusion-runtime/Cargo.toml

@@ -90,6 +90,7 @@ pub fn time_offset_fn(
     let interval = match unit.to_lowercase().as_str() {
         unit @ ("year" | "month") => interval_year_month_lit(&format!("{step} {unit}")),
         "quarter" => interval_year_month_lit(&format!("{} month", step * 3)),
+        "date" => interval_datetime_lit(&format!("{step} day")),
         unit => interval_datetime_lit(&format!("{step} {unit}")),
     };
 

vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time_offset.rs

@@ -7,6 +7,7 @@ use datafusion_common::ScalarValue;
 use serde_json::json;
 use util::check::check_transform_evaluation;
 use util::datasets::vega_json_dataset;
+use vegafusion_common::data::table::VegaFusionTable;
 use vegafusion_core::spec::transform::formula::FormulaTransformSpec;
 use vegafusion_core::spec::transform::TransformSpec;
 use vegafusion_runtime::expression::compiler::config::CompilationConfig;
@@ -287,3 +288,42 @@ fn test_formula_span() {
         &eq_config,
     );
 }
+
+#[test]
+fn test_formula_time_offset_date() {
+    let dataset = VegaFusionTable::from_json(&json!([
+        {"date": "2023-01-15"},
+        {"date": "2023-06-20"},
+        {"date": "2023-12-31"},
+    ]))
+    .unwrap();
+
+    let transform_specs: Vec<TransformSpec> = serde_json::from_value(json!([
+        {
+            "type": "formula",
+            "expr": "toDate(datum['date'])",
+            "as": "timestamp"
+        },
+        {
+            "type": "formula",
+            "expr": "timeOffset('date', datum['timestamp'], -1)",
+            "as": "prev_day"
+        },
+        {
+            "type": "formula",
+            "expr": "timeOffset('date', datum['timestamp'], 1)",
+            "as": "next_day"
+        },
+    ]))
+    .unwrap();
+
+    let comp_config = Default::default();
+    let eq_config = Default::default();
+
+    check_transform_evaluation(
+        &dataset,
+        transform_specs.as_slice(),
+        &comp_config,
+        &eq_config,
+    );
+}

vegafusion-runtime/tests/test_transform_formula.rs

@@ -5,7 +5,7 @@ path = "src/main.rs"
 [package]
 name = "vegafusion-server"
 license = "BSD-3-Clause"
-version = "2.0.7"
+version = "2.0.8"
 edition = "2021"
 description = "VegaFusion Server"
 repository = "https://github.com/vega/vegafusion"
@@ -34,16 +34,16 @@ workspace = true
 
 [dependencies.vegafusion-common]
 path = "../vegafusion-common"
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.vegafusion-core]
 path = "../vegafusion-core"
 features = ["tonic_support"]
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.vegafusion-runtime]
 path = "../vegafusion-runtime"
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.tokio]
 workspace = true

vegafusion-server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "vegafusion-wasm"
 license = "BSD-3-Clause"
-version = "2.0.7"
+version = "2.0.8"
 edition = "2021"
 description = "VegaFusion WASM package for embedding Vega charts in the browser with a connection to a VegaFusion Runtime"
 
@@ -41,15 +41,15 @@ workspace = true
 [dependencies.vegafusion-common]
 path = "../vegafusion-common"
 features = ["json"]
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.vegafusion-core]
 path = "../vegafusion-core"
-version = "2.0.7"
+version = "2.0.8"
 
 [dependencies.vegafusion-runtime]
 path = "../vegafusion-runtime"
-version = "2.0.7"
+version = "2.0.8"
 default-features = false
 features = ["http-wasm"]