Skip to content

Commit 72d7610

Browse files
michaelstaibmichaelstaib
committed
Fixed Tag Composition Tooling (#6783)
1 parent 1f5c901 commit 72d7610

File tree

30 files changed

+701
-162
lines changed

30 files changed

+701
-162
lines changed

‎src/HotChocolate/Caching/test/Caching.Tests/SchemaTests.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,29 @@ public async Task Allow_CacheControl_On_FieldDefinition()
3030
schema {
3131
query: Query
3232
}
33-
33+
3434
type Book {
3535
title: String! @cacheControl(maxAge: 5000)
3636
description: String!
3737
}
38-
38+
3939
type Query {
4040
book: Book! @cacheControl(maxAge: 0)
4141
}
42-
42+
4343
"The scope of a cache hint."
4444
enum CacheControlScope {
4545
"The value to cache is not tied to a single user."
4646
PUBLIC
4747
"The value to cache is specific to a single user."
4848
PRIVATE
4949
}
50-
50+
5151
"The `@cacheControl` directive may be provided for individual fields or entire object, interface or union types to provide caching hints to the executor."
5252
directive @cacheControl("The maximum amount of time this field's cached value is valid, in seconds." maxAge: Int "If `PRIVATE`, the field's value is specific to a single user. The default value is `PUBLIC`, which means the field's value is not tied to a single user." scope: CacheControlScope "If `true`, the field inherits the `maxAge` of its parent field." inheritMaxAge: Boolean) on OBJECT | FIELD_DEFINITION | INTERFACE | UNION
53-
<<<<<<< HEAD
5453
55-
directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
56-
=======
57-
5854
"The @tag directive is used to apply arbitrary string\nmetadata to a schema location. Custom tooling can use\nthis metadata during any step of the schema delivery flow,\nincluding composition, static analysis, and documentation.\n\ninterface Book {\n id: ID! @tag(name: \"your-value\")\n title: String!\n author: String!\n}"
5955
directive @tag("The name of the tag." name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
60-
>>>>>>> 3f34684f9c (Fixed issue that caused the tag directive to be ignored. (#6746))
6156
""");
6257
}
6358

‎src/HotChocolate/CodeGeneration/test/CodeGeneration.Neo4J.Tests/packages.lock.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,7 @@
14051405
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
14061406
"HotChocolate.Fetching": "[0.0.0, )",
14071407
"HotChocolate.Types": "[0.0.0, )",
1408+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
14081409
"HotChocolate.Validation": "[0.0.0, )",
14091410
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )",
14101411
"System.Threading.Channels": "[6.0.0, )"
@@ -1492,6 +1493,12 @@
14921493
"hotchocolate.utilities": {
14931494
"type": "Project"
14941495
},
1496+
"hotchocolate.utilities.dependencyinjection": {
1497+
"type": "Project",
1498+
"dependencies": {
1499+
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )"
1500+
}
1501+
},
14951502
"hotchocolate.validation": {
14961503
"type": "Project",
14971504
"dependencies": {
@@ -2890,6 +2897,7 @@
28902897
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
28912898
"HotChocolate.Fetching": "[0.0.0, )",
28922899
"HotChocolate.Types": "[0.0.0, )",
2900+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
28932901
"HotChocolate.Validation": "[0.0.0, )",
28942902
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )",
28952903
"System.Threading.Channels": "[7.0.0, )"
@@ -2977,6 +2985,12 @@
29772985
"hotchocolate.utilities": {
29782986
"type": "Project"
29792987
},
2988+
"hotchocolate.utilities.dependencyinjection": {
2989+
"type": "Project",
2990+
"dependencies": {
2991+
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )"
2992+
}
2993+
},
29802994
"hotchocolate.validation": {
29812995
"type": "Project",
29822996
"dependencies": {
@@ -4375,6 +4389,7 @@
43754389
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
43764390
"HotChocolate.Fetching": "[0.0.0, )",
43774391
"HotChocolate.Types": "[0.0.0, )",
4392+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
43784393
"HotChocolate.Validation": "[0.0.0, )",
43794394
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
43804395
"System.Threading.Channels": "[8.0.0, )"
@@ -4462,6 +4477,12 @@
44624477
"hotchocolate.utilities": {
44634478
"type": "Project"
44644479
},
4480+
"hotchocolate.utilities.dependencyinjection": {
4481+
"type": "Project",
4482+
"dependencies": {
4483+
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )"
4484+
}
4485+
},
44654486
"hotchocolate.validation": {
44664487
"type": "Project",
44674488
"dependencies": {

‎src/HotChocolate/Filters/test/Types.Filters.Mongo.Tests/packages.lock.json

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,8 @@
18221822
"HotChocolate": "[0.0.0, )",
18231823
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
18241824
"HotChocolate.Transport.Sockets": "[0.0.0, )",
1825-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
1825+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
1826+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
18261827
}
18271828
},
18281829
"hotchocolate.authorization": {
@@ -1838,6 +1839,7 @@
18381839
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
18391840
"HotChocolate.Fetching": "[0.0.0, )",
18401841
"HotChocolate.Types": "[0.0.0, )",
1842+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
18411843
"HotChocolate.Validation": "[0.0.0, )",
18421844
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )",
18431845
"System.Threading.Channels": "[6.0.0, )"
@@ -2031,6 +2033,12 @@
20312033
"hotchocolate.utilities": {
20322034
"type": "Project"
20332035
},
2036+
"hotchocolate.utilities.dependencyinjection": {
2037+
"type": "Project",
2038+
"dependencies": {
2039+
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )"
2040+
}
2041+
},
20342042
"hotchocolate.validation": {
20352043
"type": "Project",
20362044
"dependencies": {
@@ -3863,7 +3871,8 @@
38633871
"HotChocolate": "[0.0.0, )",
38643872
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
38653873
"HotChocolate.Transport.Sockets": "[0.0.0, )",
3866-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
3874+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
3875+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
38673876
}
38683877
},
38693878
"hotchocolate.authorization": {
@@ -3879,6 +3888,7 @@
38793888
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
38803889
"HotChocolate.Fetching": "[0.0.0, )",
38813890
"HotChocolate.Types": "[0.0.0, )",
3891+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
38823892
"HotChocolate.Validation": "[0.0.0, )",
38833893
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )",
38843894
"System.Threading.Channels": "[7.0.0, )"
@@ -4112,6 +4122,12 @@
41124122
"hotchocolate.utilities": {
41134123
"type": "Project"
41144124
},
4125+
"hotchocolate.utilities.dependencyinjection": {
4126+
"type": "Project",
4127+
"dependencies": {
4128+
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )"
4129+
}
4130+
},
41154131
"hotchocolate.validation": {
41164132
"type": "Project",
41174133
"dependencies": {
@@ -5979,7 +5995,8 @@
59795995
"HotChocolate": "[0.0.0, )",
59805996
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
59815997
"HotChocolate.Transport.Sockets": "[0.0.0, )",
5982-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
5998+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
5999+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
59836000
}
59846001
},
59856002
"hotchocolate.authorization": {
@@ -5995,6 +6012,7 @@
59956012
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
59966013
"HotChocolate.Fetching": "[0.0.0, )",
59976014
"HotChocolate.Types": "[0.0.0, )",
6015+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
59986016
"HotChocolate.Validation": "[0.0.0, )",
59996017
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
60006018
"System.Threading.Channels": "[8.0.0, )"
@@ -6228,6 +6246,12 @@
62286246
"hotchocolate.utilities": {
62296247
"type": "Project"
62306248
},
6249+
"hotchocolate.utilities.dependencyinjection": {
6250+
"type": "Project",
6251+
"dependencies": {
6252+
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )"
6253+
}
6254+
},
62316255
"hotchocolate.validation": {
62326256
"type": "Project",
62336257
"dependencies": {

‎src/HotChocolate/Filters/test/Types.Filters.Tests/packages.lock.json

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,8 @@
12891289
"HotChocolate": "[0.0.0, )",
12901290
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
12911291
"HotChocolate.Transport.Sockets": "[0.0.0, )",
1292-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
1292+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
1293+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
12931294
}
12941295
},
12951296
"hotchocolate.authorization": {
@@ -1305,6 +1306,7 @@
13051306
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
13061307
"HotChocolate.Fetching": "[0.0.0, )",
13071308
"HotChocolate.Types": "[0.0.0, )",
1309+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
13081310
"HotChocolate.Validation": "[0.0.0, )",
13091311
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )",
13101312
"System.Threading.Channels": "[6.0.0, )"
@@ -1518,6 +1520,12 @@
15181520
"hotchocolate.utilities": {
15191521
"type": "Project"
15201522
},
1523+
"hotchocolate.utilities.dependencyinjection": {
1524+
"type": "Project",
1525+
"dependencies": {
1526+
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )"
1527+
}
1528+
},
15211529
"hotchocolate.validation": {
15221530
"type": "Project",
15231531
"dependencies": {
@@ -2812,7 +2820,8 @@
28122820
"HotChocolate": "[0.0.0, )",
28132821
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
28142822
"HotChocolate.Transport.Sockets": "[0.0.0, )",
2815-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
2823+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
2824+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
28162825
}
28172826
},
28182827
"hotchocolate.authorization": {
@@ -2828,6 +2837,7 @@
28282837
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
28292838
"HotChocolate.Fetching": "[0.0.0, )",
28302839
"HotChocolate.Types": "[0.0.0, )",
2840+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
28312841
"HotChocolate.Validation": "[0.0.0, )",
28322842
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )",
28332843
"System.Threading.Channels": "[7.0.0, )"
@@ -3081,6 +3091,12 @@
30813091
"hotchocolate.utilities": {
30823092
"type": "Project"
30833093
},
3094+
"hotchocolate.utilities.dependencyinjection": {
3095+
"type": "Project",
3096+
"dependencies": {
3097+
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )"
3098+
}
3099+
},
30843100
"hotchocolate.validation": {
30853101
"type": "Project",
30863102
"dependencies": {
@@ -4442,7 +4458,8 @@
44424458
"HotChocolate": "[0.0.0, )",
44434459
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
44444460
"HotChocolate.Transport.Sockets": "[0.0.0, )",
4445-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
4461+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
4462+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
44464463
}
44474464
},
44484465
"hotchocolate.authorization": {
@@ -4458,6 +4475,7 @@
44584475
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
44594476
"HotChocolate.Fetching": "[0.0.0, )",
44604477
"HotChocolate.Types": "[0.0.0, )",
4478+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
44614479
"HotChocolate.Validation": "[0.0.0, )",
44624480
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
44634481
"System.Threading.Channels": "[8.0.0, )"
@@ -4711,6 +4729,12 @@
47114729
"hotchocolate.utilities": {
47124730
"type": "Project"
47134731
},
4732+
"hotchocolate.utilities.dependencyinjection": {
4733+
"type": "Project",
4734+
"dependencies": {
4735+
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )"
4736+
}
4737+
},
47144738
"hotchocolate.validation": {
47154739
"type": "Project",
47164740
"dependencies": {

‎src/HotChocolate/Filters/test/Types.Sorting.Mongo.Tests/packages.lock.json

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,8 @@
18221822
"HotChocolate": "[0.0.0, )",
18231823
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
18241824
"HotChocolate.Transport.Sockets": "[0.0.0, )",
1825-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
1825+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
1826+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
18261827
}
18271828
},
18281829
"hotchocolate.authorization": {
@@ -1838,6 +1839,7 @@
18381839
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
18391840
"HotChocolate.Fetching": "[0.0.0, )",
18401841
"HotChocolate.Types": "[0.0.0, )",
1842+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
18411843
"HotChocolate.Validation": "[0.0.0, )",
18421844
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )",
18431845
"System.Threading.Channels": "[6.0.0, )"
@@ -2030,6 +2032,12 @@
20302032
"hotchocolate.utilities": {
20312033
"type": "Project"
20322034
},
2035+
"hotchocolate.utilities.dependencyinjection": {
2036+
"type": "Project",
2037+
"dependencies": {
2038+
"Microsoft.Extensions.DependencyInjection": "[6.0.0, )"
2039+
}
2040+
},
20332041
"hotchocolate.validation": {
20342042
"type": "Project",
20352043
"dependencies": {
@@ -3862,7 +3870,8 @@
38623870
"HotChocolate": "[0.0.0, )",
38633871
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
38643872
"HotChocolate.Transport.Sockets": "[0.0.0, )",
3865-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
3873+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
3874+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
38663875
}
38673876
},
38683877
"hotchocolate.authorization": {
@@ -3878,6 +3887,7 @@
38783887
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
38793888
"HotChocolate.Fetching": "[0.0.0, )",
38803889
"HotChocolate.Types": "[0.0.0, )",
3890+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
38813891
"HotChocolate.Validation": "[0.0.0, )",
38823892
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )",
38833893
"System.Threading.Channels": "[7.0.0, )"
@@ -4110,6 +4120,12 @@
41104120
"hotchocolate.utilities": {
41114121
"type": "Project"
41124122
},
4123+
"hotchocolate.utilities.dependencyinjection": {
4124+
"type": "Project",
4125+
"dependencies": {
4126+
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )"
4127+
}
4128+
},
41134129
"hotchocolate.validation": {
41144130
"type": "Project",
41154131
"dependencies": {
@@ -5977,7 +5993,8 @@
59775993
"HotChocolate": "[0.0.0, )",
59785994
"HotChocolate.Subscriptions.InMemory": "[0.0.0, )",
59795995
"HotChocolate.Transport.Sockets": "[0.0.0, )",
5980-
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )"
5996+
"HotChocolate.Types.Scalars.Upload": "[0.0.0, )",
5997+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )"
59815998
}
59825999
},
59836000
"hotchocolate.authorization": {
@@ -5993,6 +6010,7 @@
59936010
"HotChocolate.Execution.Abstractions": "[0.0.0, )",
59946011
"HotChocolate.Fetching": "[0.0.0, )",
59956012
"HotChocolate.Types": "[0.0.0, )",
6013+
"HotChocolate.Utilities.DependencyInjection": "[0.0.0, )",
59966014
"HotChocolate.Validation": "[0.0.0, )",
59976015
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
59986016
"System.Threading.Channels": "[8.0.0, )"
@@ -6225,6 +6243,12 @@
62256243
"hotchocolate.utilities": {
62266244
"type": "Project"
62276245
},
6246+
"hotchocolate.utilities.dependencyinjection": {
6247+
"type": "Project",
6248+
"dependencies": {
6249+
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )"
6250+
}
6251+
},
62286252
"hotchocolate.validation": {
62296253
"type": "Project",
62306254
"dependencies": {

0 commit comments

Comments
 (0)