Handle unescaping fields aggregate/fold/pivot

vega · Feb 19, 2024 · bb02573 · bb02573
1 parent d407fc2
commit bb02573
Show file tree

Hide file tree

Showing 6 changed files with 5,906 additions and 5 deletions.
diff --git a/vegafusion-core/src/spec/transform/aggregate.rs b/vegafusion-core/src/spec/transform/aggregate.rs
@@ -174,8 +174,9 @@ impl TransformSpecTrait for AggregateTransformSpec {
             .iter()
             .filter_map(|groupby_field| {
                 let groupby_field_name = groupby_field.field();
-                if input_local_datetime_columns.contains(&groupby_field_name) {
-                    Some(groupby_field_name)
+                let unescaped = unescape_field(&groupby_field_name);
+                if input_local_datetime_columns.contains(&unescaped) {
+                    Some(unescaped)
                 } else {
                     None
                 }

diff --git a/vegafusion-core/src/spec/transform/fold.rs b/vegafusion-core/src/spec/transform/fold.rs
@@ -73,7 +73,7 @@ impl TransformSpecTrait for FoldTransformSpec {
         let value_is_datetime = self
             .fields
             .iter()
-            .all(|field| local_datetime_cols.contains(&field.field()));
+            .all(|field| local_datetime_cols.contains(&unescape_field(&field.field())));
 
         if value_is_datetime {
             let value_col = self.as_().get(1).cloned().unwrap();

diff --git a/vegafusion-core/src/spec/transform/pivot.rs b/vegafusion-core/src/spec/transform/pivot.rs
@@ -67,8 +67,9 @@ impl TransformSpecTrait for PivotTransformSpec {
             .unwrap_or_default()
             .iter()
             .filter_map(|groupby_field| {
-                if input_local_datetime_columns.contains(groupby_field) {
-                    Some(groupby_field.clone())
+                let unescaped = unescape_field(&groupby_field);
+                if input_local_datetime_columns.contains(&unescaped) {
+                    Some(unescaped)
                 } else {
                     None
                 }

diff --git a/vegafusion-runtime/tests/specs/custom/facet_dots_sort_datum.comm_plan.json b/vegafusion-runtime/tests/specs/custom/facet_dots_sort_datum.comm_plan.json
@@ -0,0 +1,25 @@
+{
+  "server_to_client": [
+    {
+      "name": "column_domain",
+      "namespace": "data",
+      "scope": []
+    },
+    {
+      "name": "data_0",
+      "namespace": "data",
+      "scope": []
+    },
+    {
+      "name": "data_0_x_domain_symbol",
+      "namespace": "data",
+      "scope": []
+    },
+    {
+      "name": "data_0_y_domain_sum_price",
+      "namespace": "data",
+      "scope": []
+    }
+  ],
+  "client_to_server": []
+}