Redesign #[derive(ScalarValue)] macro to derive ScalarValue on enums (#1025)

ilslv · web-flow · commit 5bbc73ad8997 · 2022-03-03T15:49:35.000+02:00
diff --git a/integration_tests/codegen_fail/fail/interface/argument_wrong_default_array.stderr b/integration_tests/codegen_fail/fail/interface/argument_wrong_default_array.stderr
@@ -5,6 +5,9 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
   | ^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
   |
   = help: the following implementations were found:
+            <&'a [ascii::ascii_char::AsciiChar] as From<&'a ascii::ascii_str::AsciiStr>>
+            <&'a [u8] as From<&'a ascii::ascii_str::AsciiStr>>
+            <&'a mut [ascii::ascii_char::AsciiChar] as From<&'a mut ascii::ascii_str::AsciiStr>>
             <[T; LANES] as From<Simd<T, LANES>>>
             <[bool; LANES] as From<Mask<T, LANES>>>
   = note: required because of the requirements on the impl of `Into<[bool; 2]>` for `[bool; 3]`
diff --git a/integration_tests/codegen_fail/fail/object/argument_wrong_default_array.stderr b/integration_tests/codegen_fail/fail/object/argument_wrong_default_array.stderr
@@ -5,6 +5,9 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
   | ^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
   |
   = help: the following implementations were found:
+            <&'a [ascii::ascii_char::AsciiChar] as From<&'a ascii::ascii_str::AsciiStr>>
+            <&'a [u8] as From<&'a ascii::ascii_str::AsciiStr>>
+            <&'a mut [ascii::ascii_char::AsciiChar] as From<&'a mut ascii::ascii_str::AsciiStr>>
             <[T; LANES] as From<Simd<T, LANES>>>
             <[bool; LANES] as From<Mask<T, LANES>>>
   = note: required because of the requirements on the impl of `Into<[bool; 2]>` for `[bool; 3]`
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_and_with.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_and_with.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar `with = <path>` attribute can\'t be combined with `transparent`. You can specify custom resolvers with `to_output`, `from_input`, `parse_token` attributes and still use `transparent` for unspecified ones.
+error: GraphQL scalar `with = <path>` attribute argument cannot be combined with `transparent`. You can specify custom resolvers with `to_output_with`, `from_input_with`, `parse_token`/`parse_token_with` attribute arguments and still use `transparent` for unspecified ones.
  --> fail/scalar/derive_input/attr_transparent_and_with.rs:3:25
   |
 3 | #[graphql_scalar(with = Self, transparent)]
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_multiple_named_fields.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_multiple_named_fields.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar expected exactly 1 field, e.g., Test { test: i32 } because of `transparent` attribute
+error: GraphQL scalar `transparent` attribute argument requires exactly 1 field
  --> fail/scalar/derive_input/attr_transparent_multiple_named_fields.rs:4:1
   |
 4 | / struct Scalar {
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_multiple_unnamed_fields.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_multiple_unnamed_fields.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar expected exactly 1 field, e.g., Test(i32) because of `transparent` attribute
+error: GraphQL scalar `transparent` attribute argument requires exactly 1 field
  --> fail/scalar/derive_input/attr_transparent_multiple_unnamed_fields.rs:4:1
   |
 4 | struct Scalar(i32, i32);
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_unit_struct.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/attr_transparent_unit_struct.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar expected exactly 1 field, e.g.: `Test(i32)`, `Test { test: i32 }` because of `transparent` attribute
+error: GraphQL scalar `transparent` attribute argument requires exactly 1 field
  --> fail/scalar/derive_input/attr_transparent_unit_struct.rs:4:1
   |
 4 | struct ScalarSpecifiedByUrl;
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_and_with.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_and_with.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar `with = <path>` attribute can\'t be combined with `transparent`. You can specify custom resolvers with `to_output`, `from_input`, `parse_token` attributes and still use `transparent` for unspecified ones.
+error: GraphQL scalar `with = <path>` attribute argument cannot be combined with `transparent`. You can specify custom resolvers with `to_output_with`, `from_input_with`, `parse_token`/`parse_token_with` attribute arguments and still use `transparent` for unspecified ones.
  --> fail/scalar/derive_input/derive_transparent_and_with.rs:4:18
   |
 4 | #[graphql(with = Self, transparent)]
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_multiple_named_fields.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_multiple_named_fields.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar expected exactly 1 field, e.g., Test { test: i32 } because of `transparent` attribute
+error: GraphQL scalar `transparent` attribute argument requires exactly 1 field
  --> fail/scalar/derive_input/derive_transparent_multiple_named_fields.rs:4:1
   |
 4 | / #[graphql(transparent)]
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_multiple_unnamed_fields.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_multiple_unnamed_fields.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar expected exactly 1 field, e.g., Test(i32) because of `transparent` attribute
+error: GraphQL scalar `transparent` attribute argument requires exactly 1 field
  --> fail/scalar/derive_input/derive_transparent_multiple_unnamed_fields.rs:4:1
   |
 4 | / #[graphql(transparent)]
diff --git a/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_unit_struct.stderr b/integration_tests/codegen_fail/fail/scalar/derive_input/derive_transparent_unit_struct.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar expected exactly 1 field, e.g.: `Test(i32)`, `Test { test: i32 }` because of `transparent` attribute
+error: GraphQL scalar `transparent` attribute argument requires exactly 1 field
  --> fail/scalar/derive_input/derive_transparent_unit_struct.rs:4:1
   |
 4 | / #[graphql(transparent)]
diff --git a/integration_tests/codegen_fail/fail/scalar/type_alias/attr_with_not_all_resolvers.stderr b/integration_tests/codegen_fail/fail/scalar/type_alias/attr_with_not_all_resolvers.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar all custom resolvers have to be provided via `with` or combination of `to_output_with`, `from_input_with`, `parse_token_with` attribute arguments
+error: GraphQL scalar all the resolvers have to be provided via `with` attribute argument or a combination of `to_output_with`, `from_input_with`, `parse_token_with`/`parse_token` attribute arguments
  --> fail/scalar/type_alias/attr_with_not_all_resolvers.rs:6:1
   |
 6 | type CustomScalar = Scalar;
diff --git a/integration_tests/codegen_fail/fail/scalar/type_alias/attr_without_resolvers.stderr b/integration_tests/codegen_fail/fail/scalar/type_alias/attr_without_resolvers.stderr
@@ -1,4 +1,4 @@
-error: GraphQL scalar all custom resolvers have to be provided via `with` or combination of `to_output_with`, `from_input_with`, `parse_token_with` attribute arguments
+error: GraphQL scalar all the resolvers have to be provided via `with` attribute argument or a combination of `to_output_with`, `from_input_with`, `parse_token_with`/`parse_token` attribute arguments
  --> fail/scalar/type_alias/attr_without_resolvers.rs:6:1
   |
 6 | type CustomScalar = Scalar;
diff --git a/integration_tests/codegen_fail/fail/scalar_value/missing_attributes.rs b/integration_tests/codegen_fail/fail/scalar_value/missing_attributes.rs
@@ -0,0 +1,13 @@
+use juniper::ScalarValue;
+
+#[derive(Clone, Debug, PartialEq, ScalarValue)]
+pub enum DefaultScalarValue {
+    Int(i32),
+    Float(f64),
+    #[value(as_str, as_string, into_string)]
+    String(String),
+    #[value(as_bool)]
+    Boolean(bool),
+}
+
+fn main() {}
diff --git a/integration_tests/codegen_fail/fail/scalar_value/missing_attributes.stderr b/integration_tests/codegen_fail/fail/scalar_value/missing_attributes.stderr
@@ -0,0 +1,11 @@
+error: GraphQL built-in scalars missing `#[value(as_int, as_float)]` attributes. In case you are sure that it\'s ok, use `#[value(allow_missing_attributes)]` to suppress this error.
+  --> fail/scalar_value/missing_attributes.rs:4:1
+   |
+4  | / pub enum DefaultScalarValue {
+5  | |     Int(i32),
+6  | |     Float(f64),
+7  | |     #[value(as_str, as_string, into_string)]
+...  |
+10 | |     Boolean(bool),
+11 | | }
+   | |_^
diff --git a/integration_tests/codegen_fail/fail/scalar_value/multiple_named_fields.rs b/integration_tests/codegen_fail/fail/scalar_value/multiple_named_fields.rs
@@ -0,0 +1,6 @@
+#[derive(juniper::ScalarValue)]
+enum ScalarValue {
+    Variant { first: i32, second: u64 },
+}
+
+fn main() {}
diff --git a/integration_tests/codegen_fail/fail/scalar_value/multiple_named_fields.stderr b/integration_tests/codegen_fail/fail/scalar_value/multiple_named_fields.stderr
@@ -0,0 +1,5 @@
+error: GraphQL built-in scalars expected exactly 1 field
+ --> fail/scalar_value/multiple_named_fields.rs:3:13
+  |
+3 |     Variant { first: i32, second: u64 },
+  |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/integration_tests/codegen_fail/fail/scalar_value/multiple_unnamed_fields.rs b/integration_tests/codegen_fail/fail/scalar_value/multiple_unnamed_fields.rs
@@ -0,0 +1,6 @@
+#[derive(juniper::ScalarValue)]
+enum ScalarValue {
+    Variant(u32, i64),
+}
+
+fn main() {}
diff --git a/integration_tests/codegen_fail/fail/scalar_value/multiple_unnamed_fields.stderr b/integration_tests/codegen_fail/fail/scalar_value/multiple_unnamed_fields.stderr
@@ -0,0 +1,5 @@
+error: GraphQL built-in scalars expected exactly 1 field
+ --> fail/scalar_value/multiple_unnamed_fields.rs:3:12
+  |
+3 |     Variant(u32, i64),
+  |            ^^^^^^^^^^
diff --git a/integration_tests/codegen_fail/fail/scalar_value/not_enum.rs b/integration_tests/codegen_fail/fail/scalar_value/not_enum.rs
@@ -0,0 +1,4 @@
+#[derive(juniper::ScalarValue)]
+struct ScalarValue;
+
+fn main() {}
diff --git a/integration_tests/codegen_fail/fail/scalar_value/not_enum.stderr b/integration_tests/codegen_fail/fail/scalar_value/not_enum.stderr
@@ -0,0 +1,5 @@
+error: GraphQL built-in scalars can only be derived for enums
+ --> fail/scalar_value/not_enum.rs:2:1
+  |
+2 | struct ScalarValue;
+  | ^^^^^^^^^^^^^^^^^^^
diff --git a/integration_tests/codegen_fail/fail/subscription/argument_wrong_default_array.stderr b/integration_tests/codegen_fail/fail/subscription/argument_wrong_default_array.stderr
@@ -5,6 +5,9 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
    | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
    |
    = help: the following implementations were found:
+             <&'a [ascii::ascii_char::AsciiChar] as From<&'a ascii::ascii_str::AsciiStr>>
+             <&'a [u8] as From<&'a ascii::ascii_str::AsciiStr>>
+             <&'a mut [ascii::ascii_char::AsciiChar] as From<&'a mut ascii::ascii_str::AsciiStr>>
              <[T; LANES] as From<Simd<T, LANES>>>
              <[bool; LANES] as From<Mask<T, LANES>>>
    = note: required because of the requirements on the impl of `Into<[bool; 2]>` for `[bool; 3]`
diff --git a/integration_tests/juniper_tests/src/codegen/mod.rs b/integration_tests/juniper_tests/src/codegen/mod.rs
@@ -7,6 +7,7 @@ mod object_derive;
 mod scalar_attr_derive_input;
 mod scalar_attr_type_alias;
 mod scalar_derive;
+mod scalar_value_derive;
 mod subscription_attr;
 mod union_attr;
 mod union_derive;
diff --git a/integration_tests/juniper_tests/src/codegen/scalar_value_derive.rs b/integration_tests/juniper_tests/src/codegen/scalar_value_derive.rs
@@ -0,0 +1,138 @@
+//! Tests for `#[derive(ScalarValue)]` macro.
+
+use juniper::{DefaultScalarValue, ScalarValue};
+use serde::{Deserialize, Serialize};
+
+mod trivial {
+    use super::*;
+
+    #[derive(Clone, Debug, Deserialize, PartialEq, ScalarValue, Serialize)]
+    #[serde(untagged)]
+    pub enum CustomScalarValue {
+        #[value(as_float, as_int)]
+        Int(i32),
+        #[value(as_float)]
+        Float(f64),
+        #[value(as_str, as_string, into_string)]
+        String(String),
+        #[value(as_bool)]
+        Boolean(bool),
+    }
+
+    #[test]
+    fn into_another() {
+        assert!(CustomScalarValue::from(5)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<i32>());
+        assert!(CustomScalarValue::from(0.5_f64)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<f64>());
+        assert!(CustomScalarValue::from("str".to_owned())
+            .into_another::<DefaultScalarValue>()
+            .is_type::<String>());
+        assert!(CustomScalarValue::from(true)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<bool>());
+    }
+}
+
+mod named_fields {
+    use super::*;
+
+    #[derive(Clone, Debug, Deserialize, PartialEq, ScalarValue, Serialize)]
+    #[serde(untagged)]
+    pub enum CustomScalarValue {
+        #[value(as_float, as_int)]
+        Int { int: i32 },
+        #[value(as_float)]
+        Float(f64),
+        #[value(as_str, as_string, into_string)]
+        String(String),
+        #[value(as_bool)]
+        Boolean { v: bool },
+    }
+
+    #[test]
+    fn into_another() {
+        assert!(CustomScalarValue::from(5)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<i32>());
+        assert!(CustomScalarValue::from(0.5_f64)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<f64>());
+        assert!(CustomScalarValue::from("str".to_owned())
+            .into_another::<DefaultScalarValue>()
+            .is_type::<String>());
+        assert!(CustomScalarValue::from(true)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<bool>());
+    }
+}
+
+mod custom_fn {
+    use super::*;
+
+    #[derive(Clone, Debug, Deserialize, PartialEq, ScalarValue, Serialize)]
+    #[serde(untagged)]
+    pub enum CustomScalarValue {
+        #[value(as_float, as_int)]
+        Int(i32),
+        #[value(as_float)]
+        Float(f64),
+        #[value(
+            as_str,
+            as_string = str::to_owned,
+            into_string = std::convert::identity,
+        )]
+        String(String),
+        #[value(as_bool)]
+        Boolean(bool),
+    }
+
+    #[test]
+    fn into_another() {
+        assert!(CustomScalarValue::from(5)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<i32>());
+        assert!(CustomScalarValue::from(0.5_f64)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<f64>());
+        assert!(CustomScalarValue::from("str".to_owned())
+            .into_another::<DefaultScalarValue>()
+            .is_type::<String>());
+        assert!(CustomScalarValue::from(true)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<bool>());
+    }
+}
+
+mod allow_missing_attributes {
+    use super::*;
+
+    #[derive(Clone, Debug, Deserialize, PartialEq, ScalarValue, Serialize)]
+    #[serde(untagged)]
+    #[value(allow_missing_attributes)]
+    pub enum CustomScalarValue {
+        Int(i32),
+        #[value(as_float)]
+        Float(f64),
+        #[value(as_str, as_string, into_string)]
+        String(String),
+        #[value(as_bool)]
+        Boolean(bool),
+    }
+
+    #[test]
+    fn into_another() {
+        assert!(CustomScalarValue::Int(5).as_int().is_none());
+        assert!(CustomScalarValue::from(0.5_f64)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<f64>());
+        assert!(CustomScalarValue::from("str".to_owned())
+            .into_another::<DefaultScalarValue>()
+            .is_type::<String>());
+        assert!(CustomScalarValue::from(true)
+            .into_another::<DefaultScalarValue>()
+            .is_type::<bool>());
+    }
+}
diff --git a/integration_tests/juniper_tests/src/custom_scalar.rs b/integration_tests/juniper_tests/src/custom_scalar.rs
diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md
diff --git a/juniper/src/executor/look_ahead.rs b/juniper/src/executor/look_ahead.rs
diff --git a/juniper/src/schema/translate/graphql_parser.rs b/juniper/src/schema/translate/graphql_parser.rs
diff --git a/juniper/src/types/scalars.rs b/juniper/src/types/scalars.rs
diff --git a/juniper/src/value/scalar.rs b/juniper/src/value/scalar.rs
diff --git a/juniper_codegen/Cargo.toml b/juniper_codegen/Cargo.toml
diff --git a/juniper_codegen/src/lib.rs b/juniper_codegen/src/lib.rs
diff --git a/juniper_codegen/src/result.rs b/juniper_codegen/src/result.rs
diff --git a/juniper_codegen/src/scalar_value/mod.rs b/juniper_codegen/src/scalar_value/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error: GraphQL scalar `with = <path>` attribute can\'t be combined with `transparent`. You can specify custom resolvers with `to_output`, `from_input`, `parse_token` attributes and still use `transparent` for unspecified ones.
	`1`	+error: GraphQL scalar `with = <path>` attribute argument cannot be combined with `transparent`. You can specify custom resolvers with `to_output_with`, `from_input_with`, `parse_token`/`parse_token_with` attribute arguments and still use `transparent` for unspecified ones.
`2`	`2`	`--> fail/scalar/derive_input/attr_transparent_and_with.rs:3:25`
`3`	`3`	`\|`
`4`	`4`	`3 \| #[graphql_scalar(with = Self, transparent)]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error: GraphQL scalar expected exactly 1 field, e.g., Test { test: i32 } because of `transparent` attribute
	`1`	+error: GraphQL scalar `transparent` attribute argument requires exactly 1 field
`2`	`2`	`--> fail/scalar/derive_input/attr_transparent_multiple_named_fields.rs:4:1`
`3`	`3`	`\|`
`4`	`4`	`4 \| / struct Scalar {`