Allow @deprecated directive on field args

graph-gophers#243
sourcegraph · Dec 18, 2022 · 05279fa · 05279fa
1 parent b320b99
commit 05279fa
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 10 deletions.
diff --git a/example/social/introspect.json b/example/social/introspect.json
@@ -17,7 +17,8 @@
         "description": "Marks an element of a GraphQL schema as no longer supported.",
         "locations": [
           "FIELD_DEFINITION",
-          "ENUM_VALUE"
+          "ENUM_VALUE",
+          "ARGUMENT_DEFINITION"
         ],
         "name": "deprecated"
       },

diff --git a/example/starwars/introspect.json b/example/starwars/introspect.json
@@ -17,7 +17,8 @@
         "description": "Marks an element of a GraphQL schema as no longer supported.",
         "locations": [
           "FIELD_DEFINITION",
-          "ENUM_VALUE"
+          "ENUM_VALUE",
+          "ARGUMENT_DEFINITION"
         ],
         "name": "deprecated"
       },

diff --git a/graphql_test.go b/graphql_test.go
@@ -1180,8 +1180,8 @@ func TestFragments(t *testing.T) {
 			`,
 		},
 		{
-			Schema:         starwarsSchema,
-			Query:          `
+			Schema: starwarsSchema,
+			Query: `
 				query {
 					human(id: "1000") {
 						id
@@ -1733,6 +1733,24 @@ func TestEnums(t *testing.T) {
 	})
 }
 
+type testDeprecatedArgsResolver struct{}
+
+func (r *testDeprecatedArgsResolver) A(ctx context.Context, args struct{ B *string }) int32 {
+	return 0
+}
+
+func TestDeprecatedArgs(t *testing.T) {
+	graphql.MustParseSchema(`
+		schema {
+			query: Query
+		}
+
+		type Query {
+			a(b: String @deprecated): Int!
+		}
+	`, &testDeprecatedArgsResolver{})
+}
+
 func TestInlineFragments(t *testing.T) {
 	gqltesting.RunTests(t, []*gqltesting.Test{
 		{
@@ -2506,7 +2524,8 @@ func TestIntrospection(t *testing.T) {
 									"description": "Marks an element of a GraphQL schema as no longer supported.",
 									"locations": [
 										"FIELD_DEFINITION",
-										"ENUM_VALUE"
+										"ENUM_VALUE",
+										"ARGUMENT_DEFINITION"
 									],
 									"args": [
 										{

diff --git a/internal/common/values.go b/internal/common/values.go
@@ -27,9 +27,11 @@ func ParseArgumentList(l *Lexer) types.ArgumentList {
 		name := l.ConsumeIdentWithLoc()
 		l.ConsumeToken(':')
 		value := ParseLiteral(l, false)
+		directives := ParseDirectives(l)
 		args = append(args, &types.Argument{
-			Name:  name,
-			Value: value,
+			Name:       name,
+			Value:      value,
+			Directives: directives,
 		})
 	}
 	l.ConsumeToken(')')

diff --git a/internal/schema/meta.go b/internal/schema/meta.go
@@ -57,7 +57,7 @@ var metaSrc = `
 		# for how to access supported similar data. Formatted in
 		# [Markdown](https://daringfireball.net/projects/markdown/).
 		reason: String = "No longer supported"
-	) on FIELD_DEFINITION | ENUM_VALUE
+	) on FIELD_DEFINITION | ENUM_VALUE | ARGUMENT_DEFINITION
 
 	# Provides a scalar specification URL for specifying the behavior of custom scalar types.
 	directive @specifiedBy(

diff --git a/types/argument.go b/types/argument.go
@@ -4,8 +4,9 @@ package types
 //
 // https://spec.graphql.org/draft/#sec-Language.Arguments
 type Argument struct {
-	Name  Ident
-	Value Value
+	Name       Ident
+	Value      Value
+	Directives DirectiveList
 }
 
 // ArgumentList is a collection of GraphQL Arguments.