Skip to content

Commit e75654e

Browse files
goto-bus-stopgoto-bus-stop
committed
fix(compiler): accept enum value (unquoted string) as input for custom scalars, fixes #834
Validation does not currently accept something like this: ```graphql scalar Currency type Query { convertToUSD(amount: Int!, currency: Currency!): Int! } query { convertToUSD(amount: 100, currency: EUR) } ``` which is accepted by graphql-js and (rarely) used by customers. I don't love it, but we already accept enum values nested inside lists or objects as input for custom scalars, so it makes sense to accept this too.
1 parent d545a6a commit e75654e

File tree

4 files changed

+195
-1
lines changed

4 files changed

+195
-1
lines changed

‎crates/apollo-compiler/src/validation/value.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ pub(crate) fn value_of_correct_type(
159159
_ => diagnostics.push(unsupported_type(arg_value, ty)),
160160
},
161161
ast::Value::Enum(value) => match &type_definition {
162+
schema::ExtendedType::Scalar(scalar) if !scalar.is_built_in() => {
163+
// Accept enum values as input for custom scalars
164+
}
162165
schema::ExtendedType::Enum(enum_) => {
163166
if !enum_.values.contains_key(value) {
164167
diagnostics.push(ValidationError::new(
@@ -199,7 +202,7 @@ pub(crate) fn value_of_correct_type(
199202
}
200203
}
201204
ast::Value::Object(obj) => match &type_definition {
202-
schema::ExtendedType::Scalar(scalar) if !scalar.is_built_in() => (),
205+
schema::ExtendedType::Scalar(scalar) if !scalar.is_built_in() => {}
203206
schema::ExtendedType::InputObject(input_obj) => {
204207
let undefined_field = obj
205208
.iter()

‎crates/apollo-compiler/test_data/ok/0041_unquoted_string_for_custom_scalar.graphql

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
scalar Currency
2+
3+
type Query {
4+
convertToUSD(amount: Int!, currency: Currency!): Int!
5+
}
6+
7+
query {
8+
convertToUSD(amount: 100, currency: EUR)
9+
}

‎crates/apollo-compiler/test_data/ok/0041_unquoted_string_for_custom_scalar.txt

+173
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
Schema {
2+
sources: {
3+
-1: SourceFile {
4+
path: "built_in.graphql",
5+
source_text: include_str!("built_in.graphql"),
6+
},
7+
40: SourceFile {
8+
path: "0041_unquoted_string_for_custom_scalar.graphql",
9+
source_text: "scalar Currency\n\ntype Query {\n convertToUSD(amount: Int!, currency: Currency!): Int!\n}\n\nquery {\n convertToUSD(amount: 100, currency: EUR)\n}\n",
10+
},
11+
},
12+
schema_definition: SchemaDefinition {
13+
description: None,
14+
directives: [],
15+
query: Some(
16+
ComponentName {
17+
origin: Definition,
18+
name: "Query",
19+
},
20+
),
21+
mutation: None,
22+
subscription: None,
23+
},
24+
directive_definitions: {
25+
"skip": built_in_directive!("skip"),
26+
"include": built_in_directive!("include"),
27+
"deprecated": built_in_directive!("deprecated"),
28+
"specifiedBy": built_in_directive!("specifiedBy"),
29+
},
30+
types: {
31+
"__Schema": built_in_type!("__Schema"),
32+
"__Type": built_in_type!("__Type"),
33+
"__TypeKind": built_in_type!("__TypeKind"),
34+
"__Field": built_in_type!("__Field"),
35+
"__InputValue": built_in_type!("__InputValue"),
36+
"__EnumValue": built_in_type!("__EnumValue"),
37+
"__Directive": built_in_type!("__Directive"),
38+
"__DirectiveLocation": built_in_type!("__DirectiveLocation"),
39+
"Int": built_in_type!("Int"),
40+
"Float": built_in_type!("Float"),
41+
"String": built_in_type!("String"),
42+
"Boolean": built_in_type!("Boolean"),
43+
"ID": built_in_type!("ID"),
44+
"Currency": Scalar(
45+
0..15 @40 ScalarType {
46+
description: None,
47+
name: "Currency",
48+
directives: [],
49+
},
50+
),
51+
"Query": Object(
52+
17..87 @40 ObjectType {
53+
description: None,
54+
name: "Query",
55+
implements_interfaces: {},
56+
directives: [],
57+
fields: {
58+
"convertToUSD": Component {
59+
origin: Definition,
60+
node: 32..85 @40 FieldDefinition {
61+
description: None,
62+
name: "convertToUSD",
63+
arguments: [
64+
45..57 @40 InputValueDefinition {
65+
description: None,
66+
name: "amount",
67+
ty: 53..57 @40 NonNullNamed(
68+
"Int",
69+
),
70+
default_value: None,
71+
directives: [],
72+
},
73+
59..78 @40 InputValueDefinition {
74+
description: None,
75+
name: "currency",
76+
ty: 69..78 @40 NonNullNamed(
77+
"Currency",
78+
),
79+
default_value: None,
80+
directives: [],
81+
},
82+
],
83+
ty: NonNullNamed(
84+
"Int",
85+
),
86+
directives: [],
87+
},
88+
},
89+
},
90+
},
91+
),
92+
},
93+
}
94+
ExecutableDocument {
95+
sources: {
96+
-1: SourceFile {
97+
path: "built_in.graphql",
98+
source_text: include_str!("built_in.graphql"),
99+
},
100+
40: SourceFile {
101+
path: "0041_unquoted_string_for_custom_scalar.graphql",
102+
source_text: "scalar Currency\n\ntype Query {\n convertToUSD(amount: Int!, currency: Currency!): Int!\n}\n\nquery {\n convertToUSD(amount: 100, currency: EUR)\n}\n",
103+
},
104+
},
105+
anonymous_operation: Some(
106+
89..141 @40 Operation {
107+
operation_type: Query,
108+
name: None,
109+
variables: [],
110+
directives: [],
111+
selection_set: SelectionSet {
112+
ty: "Query",
113+
selections: [
114+
Field(
115+
99..139 @40 Field {
116+
definition: 32..85 @40 FieldDefinition {
117+
description: None,
118+
name: "convertToUSD",
119+
arguments: [
120+
45..57 @40 InputValueDefinition {
121+
description: None,
122+
name: "amount",
123+
ty: 53..57 @40 NonNullNamed(
124+
"Int",
125+
),
126+
default_value: None,
127+
directives: [],
128+
},
129+
59..78 @40 InputValueDefinition {
130+
description: None,
131+
name: "currency",
132+
ty: 69..78 @40 NonNullNamed(
133+
"Currency",
134+
),
135+
default_value: None,
136+
directives: [],
137+
},
138+
],
139+
ty: NonNullNamed(
140+
"Int",
141+
),
142+
directives: [],
143+
},
144+
alias: None,
145+
name: "convertToUSD",
146+
arguments: [
147+
112..123 @40 Argument {
148+
name: "amount",
149+
value: 120..123 @40 Int(
150+
100,
151+
),
152+
},
153+
125..138 @40 Argument {
154+
name: "currency",
155+
value: 135..138 @40 Enum(
156+
"EUR",
157+
),
158+
},
159+
],
160+
directives: [],
161+
selection_set: SelectionSet {
162+
ty: "Int",
163+
selections: [],
164+
},
165+
},
166+
),
167+
],
168+
},
169+
},
170+
),
171+
named_operations: {},
172+
fragments: {},
173+
}

‎crates/apollo-compiler/test_data/serializer/ok/0041_unquoted_string_for_custom_scalar.graphql

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
scalar Currency
2+
3+
type Query {
4+
convertToUSD(amount: Int!, currency: Currency!): Int!
5+
}
6+
7+
query {
8+
convertToUSD(amount: 100, currency: EUR)
9+
}

0 commit comments

Comments
 (0)