Skip to content

Commit 2b17eaf

Browse files
dariuszkucdariuszkuc
authored
fix: add missing SCHEMA @tag location (#403)
Starting with Federation v2.3 `@tag` is applicable on `SCHEMA` as well.
1 parent 772d9dd commit 2b17eaf

18 files changed

+66
-36
lines changed

‎graphql-java-support/src/main/resources/definitions_fed2_3.graphqls

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ directive @inaccessible on
1919
| INPUT_OBJECT
2020
| INPUT_FIELD_DEFINITION
2121
| ARGUMENT_DEFINITION
22-
directive @tag(name: String!) repeatable on
23-
| FIELD_DEFINITION
24-
| INTERFACE
25-
| OBJECT
26-
| UNION
27-
| ARGUMENT_DEFINITION
28-
| SCALAR
29-
| ENUM
30-
| ENUM_VALUE
31-
| INPUT_OBJECT
32-
| INPUT_FIELD_DEFINITION
3322
scalar FieldSet
3423

3524
#
@@ -67,3 +56,16 @@ directive @shareable repeatable on FIELD_DEFINITION | OBJECT
6756
#
6857

6958
directive @interfaceObject on OBJECT
59+
60+
directive @tag(name: String!) repeatable on
61+
| FIELD_DEFINITION
62+
| INTERFACE
63+
| OBJECT
64+
| UNION
65+
| ARGUMENT_DEFINITION
66+
| SCALAR
67+
| ENUM
68+
| ENUM_VALUE
69+
| INPUT_OBJECT
70+
| INPUT_FIELD_DEFINITION
71+
| SCHEMA

‎graphql-java-support/src/main/resources/definitions_fed2_5.graphqls

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ directive @inaccessible on
1919
| INPUT_OBJECT
2020
| INPUT_FIELD_DEFINITION
2121
| ARGUMENT_DEFINITION
22-
directive @tag(name: String!) repeatable on
23-
| FIELD_DEFINITION
24-
| INTERFACE
25-
| OBJECT
26-
| UNION
27-
| ARGUMENT_DEFINITION
28-
| SCALAR
29-
| ENUM
30-
| ENUM_VALUE
31-
| INPUT_OBJECT
32-
| INPUT_FIELD_DEFINITION
3322
scalar FieldSet
3423

3524
#
@@ -68,6 +57,19 @@ directive @shareable repeatable on FIELD_DEFINITION | OBJECT
6857

6958
directive @interfaceObject on OBJECT
7059

60+
directive @tag(name: String!) repeatable on
61+
| FIELD_DEFINITION
62+
| INTERFACE
63+
| OBJECT
64+
| UNION
65+
| ARGUMENT_DEFINITION
66+
| SCALAR
67+
| ENUM
68+
| ENUM_VALUE
69+
| INPUT_OBJECT
70+
| INPUT_FIELD_DEFINITION
71+
| SCHEMA
72+
7173
#
7274
# federation-v2.5
7375
#

‎graphql-java-support/src/main/resources/definitions_fed2_6.graphqls

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,19 @@ directive @shareable repeatable on FIELD_DEFINITION | OBJECT
6868

6969
directive @interfaceObject on OBJECT
7070

71+
directive @tag(name: String!) repeatable on
72+
| FIELD_DEFINITION
73+
| INTERFACE
74+
| OBJECT
75+
| UNION
76+
| ARGUMENT_DEFINITION
77+
| SCALAR
78+
| ENUM
79+
| ENUM_VALUE
80+
| INPUT_OBJECT
81+
| INPUT_FIELD_DEFINITION
82+
| SCHEMA
83+
7184
#
7285
# federation-v2.5
7386
#

‎graphql-java-support/src/main/resources/definitions_fed2_7.graphqls

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,19 @@ directive @shareable repeatable on FIELD_DEFINITION | OBJECT
6767

6868
directive @interfaceObject on OBJECT
6969

70+
directive @tag(name: String!) repeatable on
71+
| FIELD_DEFINITION
72+
| INTERFACE
73+
| OBJECT
74+
| UNION
75+
| ARGUMENT_DEFINITION
76+
| SCALAR
77+
| ENUM
78+
| ENUM_VALUE
79+
| INPUT_OBJECT
80+
| INPUT_FIELD_DEFINITION
81+
| SCHEMA
82+
7083
#
7184
# federation-v2.5
7285
#

‎graphql-java-support/src/test/resources/schemas/authorization/schema_federated.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ directive @link(as: String, for: link__Purpose, import: [link__Import], url: Str
2828

2929
directive @requiresScopes(scopes: [[Scope!]!]!) on SCALAR | OBJECT | FIELD_DEFINITION | INTERFACE | ENUM
3030

31-
directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
31+
directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
3232

3333
union _Entity = Product
3434

‎graphql-java-support/src/test/resources/schemas/authorization/schema_full.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ directive @specifiedBy(
5555
url: String!
5656
) on SCALAR
5757

58-
directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
58+
directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
5959

6060
union _Entity = Product
6161

‎graphql-java-support/src/test/resources/schemas/customAuthenticated/schema_federated.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeat
3030

3131
directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
3232

33-
directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
33+
directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
3434

3535
union _Entity = Product
3636

‎graphql-java-support/src/test/resources/schemas/customAuthenticated/schema_full.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ directive @specifiedBy(
5757
url: String!
5858
) on SCALAR
5959

60-
directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
60+
directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
6161

6262
union _Entity = Product
6363

‎graphql-java-support/src/test/resources/schemas/fedV2/schema_federated.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ directive @requires(fields: federation__FieldSet!) on FIELD_DEFINITION
2626

2727
directive @shareable repeatable on OBJECT | FIELD_DEFINITION
2828

29-
directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
29+
directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
3030

3131
union _Entity = DeprecatedProduct | Inventory | Product | ProductResearch | User
3232

‎graphql-java-support/src/test/resources/schemas/fedV2/schema_full.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ directive @specifiedBy(
5353
url: String!
5454
) on SCALAR
5555

56-
directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
56+
directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
5757

5858
union _Entity = DeprecatedProduct | Inventory | Product | ProductResearch | User
5959

0 commit comments

Comments
 (0)