Remake to accept ref

Author: tyranron

juniper/src/lib.rs

@@ -103,8 +103,9 @@ pub use crate::{
     },
     validation::RuleError,
     value::{
-        AnyExt, DefaultScalarValue, FromScalarValue, IntoValue, Object, ParseScalarResult,
-        ParseScalarValue, Scalar, ScalarValue, TryToPrimitive, Value, WrongInputScalarTypeError, IntoScalarValue,
+        AnyExt, DefaultScalarValue, FromScalarValue, ToScalarValue, IntoValue, Object,
+        ParseScalarResult, ParseScalarValue, Scalar, ScalarValue, TryToPrimitive, Value,
+        WrongInputScalarTypeError,
     },
 };
 

juniper/src/types/pointers.rs

@@ -11,7 +11,7 @@ use crate::{
         async_await::GraphQLValueAsync,
         base::{Arguments, GraphQLType, GraphQLValue},
     },
-    value::{FromScalarValue, ScalarValue},
+    value::{FromScalarValue, ToScalarValue, ScalarValue},
 };
 
 impl<S, T> GraphQLType<S> for Box<T>
@@ -99,6 +99,15 @@ where
     }
 }
 
+impl<T, S> ToScalarValue<S> for Box<T>
+where
+    T: ToScalarValue<S> + ?Sized,
+{
+    fn to_scalar_value(&self) -> S {
+        (**self).to_scalar_value()
+    }
+}
+
 impl<T, S> FromInputValue<S> for Box<T>
 where
     S: ScalarValue,
@@ -204,6 +213,15 @@ where
     }
 }
 
+impl<T, S> ToScalarValue<S> for &T
+where
+    T: ToScalarValue<S> + ?Sized,
+{
+    fn to_scalar_value(&self) -> S {
+        (**self).to_scalar_value()
+    }
+}
+
 impl<T, S> ToInputValue<S> for &T
 where
     S: fmt::Debug,
@@ -299,6 +317,15 @@ where
     }
 }
 
+impl<T, S> ToScalarValue<S> for Arc<T>
+where
+    T: ToScalarValue<S> + ?Sized,
+{
+    fn to_scalar_value(&self) -> S {
+        (**self).to_scalar_value()
+    }
+}
+
 impl<T, S> FromInputValue<S> for Arc<T>
 where
     S: ScalarValue,

juniper/src/types/scalars.rs

@@ -17,7 +17,7 @@ use crate::{
         subscriptions::GraphQLSubscriptionValue,
     },
     value::{
-        FromScalarValue, ParseScalarResult, ScalarValue, TryToPrimitive, Value,
+        FromScalarValue, ParseScalarResult, ScalarValue, ToScalarValue, TryToPrimitive, Value,
         WrongInputScalarTypeError,
     },
 };
@@ -76,6 +76,15 @@ mod impl_string_scalar {
         }
     }
 
+    impl<S> ToScalarValue<S> for String
+    where
+        Self: Into<S>,
+    {
+        fn to_scalar_value(&self) -> S {
+            self.clone().into()
+        }
+    }
+
     pub(super) fn to_output<S: ScalarValue>(v: &str) -> Value<S> {
         Value::scalar(v.to_owned())
     }
@@ -291,15 +300,6 @@ where
     }
 }
 
-impl<S> ToInputValue<S> for &str
-where
-    S: ScalarValue,
-{
-    fn to_input_value(&self) -> InputValue<S> {
-        InputValue::scalar(String::from(*self))
-    }
-}
-
 impl<'s, S> FromScalarValue<'s, S> for &'s str
 where
     S: TryToPrimitive<'s, Self, Error: IntoFieldError<S>> + 's,
@@ -311,6 +311,21 @@ where
     }
 }
 
+impl<S: ScalarValue> ToScalarValue<S> for str {
+    fn to_scalar_value(&self) -> S {
+        S::from_displayable(self)
+    }
+}
+
+impl<S> ToInputValue<S> for &str
+where
+    str: ToScalarValue<S>,
+{
+    fn to_input_value(&self) -> InputValue<S> {
+        InputValue::scalar::<S>(self.to_scalar_value())
+    }
+}
+
 #[graphql_scalar]
 #[graphql(with = impl_boolean_scalar, from_input_with = __builtin)]
 type Boolean = bool;
@@ -329,6 +344,15 @@ mod impl_boolean_scalar {
         }
     }
 
+    impl<S> ToScalarValue<S> for Boolean
+    where
+        Self: Into<S>,
+    {
+        fn to_scalar_value(&self) -> S {
+            (*self).into()
+        }
+    }
+
     pub(super) fn to_output<S: ScalarValue>(v: &Boolean) -> Value<S> {
         Value::scalar(*v)
     }
@@ -357,6 +381,15 @@ mod impl_int_scalar {
         }
     }
 
+    impl<S> ToScalarValue<S> for Int
+    where
+        Self: Into<S>,
+    {
+        fn to_scalar_value(&self) -> S {
+            (*self).into()
+        }
+    }
+
     pub(super) fn to_output<S: ScalarValue>(v: &Int) -> Value<S> {
         Value::scalar(*v)
     }
@@ -390,6 +423,15 @@ mod impl_float_scalar {
         }
     }
 
+    impl<S> ToScalarValue<S> for Float
+    where
+        Self: Into<S>,
+    {
+        fn to_scalar_value(&self) -> S {
+            (*self).into()
+        }
+    }
+
     pub(super) fn to_output<S: ScalarValue>(v: &Float) -> Value<S> {
         Value::scalar(*v)
     }

juniper/src/value/mod.rs

@@ -9,8 +9,8 @@ use compact_str::CompactString;
 pub use self::{
     object::Object,
     scalar::{
-        AnyExt, DefaultScalarValue, FromScalarValue, ParseScalarResult, ParseScalarValue, Scalar,
-        ScalarValue, TryToPrimitive, WrongInputScalarTypeError, IntoScalarValue,
+        AnyExt, DefaultScalarValue, FromScalarValue, ToScalarValue, ParseScalarResult,
+        ParseScalarValue, Scalar, ScalarValue, TryToPrimitive, WrongInputScalarTypeError,
     },
 };
 use crate::{

juniper/src/value/scalar.rs

@@ -10,7 +10,10 @@ use std::{
     fmt, ptr,
 };
 
-use crate::{FieldError, IntoFieldError, parser::{ParseError, ScalarToken}, Value};
+use crate::{
+    FieldError, IntoFieldError,
+    parser::{ParseError, ScalarToken},
+};
 #[cfg(doc)]
 use crate::{GraphQLScalar, GraphQLValue, Value};
 
@@ -567,16 +570,10 @@ impl<'a, S: ScalarValue> IntoFieldError<S> for WrongInputScalarTypeError<'a, S>
     }
 }
 
-pub trait IntoScalarValue<S = DefaultScalarValue>: Sized {
+pub trait ToScalarValue<S = DefaultScalarValue> {
     /// Converts this value into a [`ScalarValue`].
     #[must_use]
-    fn into_scalar_value(self) -> S;
-}
-
-impl<S: ScalarValue> IntoScalarValue<S> for S {
-    fn into_scalar_value(self) -> Self {
-        self
-    }
+    fn to_scalar_value(&self) -> S;
 }
 
 /// Transparent wrapper over a value, indicating it being a [`ScalarValue`].