refactor: make DynamicValue polymorphic (#2262)

src/core/blueprint/dynamic_value.rs

@@ -5,17 +5,17 @@ use serde_json::Value;
 use crate::core::mustache::Mustache;
 
 #[derive(Debug, Clone)]
-pub enum DynamicValue {
-    Value(ConstValue),
+pub enum DynamicValue<A> {
+    Value(A),
     Mustache(Mustache),
-    Object(IndexMap<Name, DynamicValue>),
-    Array(Vec<DynamicValue>),
+    Object(IndexMap<Name, DynamicValue<A>>),
+    Array(Vec<DynamicValue<A>>),
 }
 
-impl TryFrom<&DynamicValue> for ConstValue {
+impl TryFrom<&DynamicValue<ConstValue>> for ConstValue {
     type Error = anyhow::Error;
 
-    fn try_from(value: &DynamicValue) -> Result<Self, Self::Error> {
+    fn try_from(value: &DynamicValue<ConstValue>) -> Result<Self, Self::Error> {
         match value {
             DynamicValue::Value(v) => Ok(v.to_owned()),
             DynamicValue::Mustache(_) => Err(anyhow::anyhow!(
@@ -37,7 +37,7 @@ impl TryFrom<&DynamicValue> for ConstValue {
     }
 }
 
-impl DynamicValue {
+impl<A> DynamicValue<A> {
     // Helper method to determine if the value is constant (non-mustache).
     pub fn is_const(&self) -> bool {
         match self {
@@ -49,7 +49,7 @@ impl DynamicValue {
     }
 }
 
-impl TryFrom<&Value> for DynamicValue {
+impl TryFrom<&Value> for DynamicValue<ConstValue> {
     type Error = anyhow::Error;
 
     fn try_from(value: &Value) -> Result<Self, Self::Error> {
@@ -63,7 +63,7 @@ impl TryFrom<&Value> for DynamicValue {
                 Ok(DynamicValue::Object(out))
             }
             Value::Array(arr) => {
-                let out: Result<Vec<DynamicValue>, Self::Error> =
+                let out: Result<Vec<DynamicValue<ConstValue>>, Self::Error> =
                     arr.iter().map(DynamicValue::try_from).collect();
                 Ok(DynamicValue::Array(out?))
             }

src/core/ir/jit/synth.rs

@@ -304,7 +304,6 @@ mod tests {
 
     #[test]
     fn test_json_placeholder() {
-        // FIXME: doesn't work when userId is queried
         let synth = JsonPlaceholder::init("{ posts { id title userId user { id name } } }");
         let val = synth.synthesize();
         insta::assert_snapshot!(serde_json::to_string_pretty(&val).unwrap())

src/core/ir/model.rs

@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::fmt::Debug;
 use std::num::NonZeroU64;
 
+use async_graphql::Value;
 use strum_macros::Display;
 
 use super::{EvalContext, ResolverContextLike};
@@ -14,7 +15,7 @@ use crate::core::{grpc, http};
 #[derive(Clone, Debug, Display)]
 pub enum IR {
     Context(Context),
-    Dynamic(DynamicValue),
+    Dynamic(DynamicValue<Value>),
     #[strum(to_string = "{0}")]
     IO(IO),
     Cache(Cache),

src/core/serde_value_ext.rs

@@ -10,7 +10,7 @@ pub trait ValueExt {
     fn render_value(&self, ctx: &impl PathString) -> GraphQLValue;
 }
 
-impl ValueExt for DynamicValue {
+impl ValueExt for DynamicValue<async_graphql::Value> {
     fn render_value<'a>(&self, ctx: &'a impl PathString) -> GraphQLValue {
         match self {
             DynamicValue::Value(value) => value.to_owned(),