Restore support for domains of the form

"domain": { "fields": [["sum_value_start"], ["sum_value_end"]] }
vega · Sep 16, 2023 · 0e2bc18 · 0e2bc18
1 parent f2e3d6c
commit 0e2bc18
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/vegafusion-core/src/spec/scale.rs b/vegafusion-core/src/spec/scale.rs
@@ -68,6 +68,7 @@ impl ScaleTypeSpec {
 pub enum ScaleDomainSpec {
     Array(Vec<ScaleArrayElementSpec>),
     FieldReference(ScaleFieldReferenceSpec),
+    FieldsVecStrings(ScaleVecStringsSpec),
     FieldsReference(ScaleFieldsReferenceSpec),
     FieldsReferences(ScaleFieldsReferencesSpec),
     FieldsSignals(ScaleSignalsSpec),
@@ -86,6 +87,14 @@ pub struct ScaleFieldsReferencesSpec {
     pub extra: HashMap<String, Value>,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct ScaleVecStringsSpec {
+    pub fields: Vec<Vec<String>>,
+
+    #[serde(flatten)]
+    pub extra: HashMap<String, Value>,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum ScaleDataReferenceOrSignalSpec {
@@ -110,7 +119,9 @@ pub struct ScaleFieldReferenceSpec {
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ScaleFieldsReferenceSpec {
-    pub data: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub data: Option<String>,
+
     pub fields: Vec<String>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -122,15 +133,19 @@ pub struct ScaleFieldsReferenceSpec {
 
 impl ScaleFieldsReferenceSpec {
     pub fn to_field_references(&self) -> Vec<ScaleFieldReferenceSpec> {
-        self.fields
-            .iter()
-            .map(|f| ScaleFieldReferenceSpec {
-                data: self.data.clone(),
-                field: f.clone(),
-                sort: self.sort.clone(),
-                extra: Default::default(),
-            })
-            .collect::<Vec<_>>()
+        if let Some(data) = &self.data.clone() {
+            self.fields
+                .iter()
+                .map(|f| ScaleFieldReferenceSpec {
+                    data: data.clone(),
+                    field: f.clone(),
+                    sort: self.sort.clone(),
+                    extra: Default::default(),
+                })
+                .collect::<Vec<_>>()
+        } else {
+            Vec::new()
+        }
     }
 }