Added tag directive refinements.

src/HotChocolate/ApolloFederation/src/ApolloFederation/Extensions/ApolloFederationRequestExecutorBuilderExtensions.cs

@@ -28,7 +28,7 @@ public static IRequestExecutorBuilder AddApolloFederation(
         {
             throw new ArgumentNullException(nameof(builder));
         }
-
-        return builder.ConfigureSchema(s => ApolloFederationSchemaBuilderExtensions.AddApolloFederation(s));
+        
+        return builder.ConfigureSchema(s => s.AddApolloFederation());
     }
 }

src/HotChocolate/ApolloFederation/src/ApolloFederation/Extensions/ApolloFederationSchemaBuilderExtensions.cs

@@ -20,7 +20,7 @@ public static class ApolloFederationSchemaBuilderExtensions
     /// <exception cref="ArgumentNullException">
     /// The <paramref name="builder"/> is <c>null</c>.
     /// </exception>
-    public static ISchemaBuilder AddApolloFederation(
+    internal static ISchemaBuilder AddApolloFederation(
         this ISchemaBuilder builder)
     {
         if (builder is null)

src/HotChocolate/ApolloFederation/src/ApolloFederation/FederationTypeInterceptor.cs

@@ -14,6 +14,7 @@
 using HotChocolate.Types.Descriptors.Definitions;
 using static HotChocolate.ApolloFederation.ThrowHelper;
 using static HotChocolate.ApolloFederation.Constants.WellKnownContextData;
+using static HotChocolate.Types.TagHelper;
 
 namespace HotChocolate.ApolloFederation;
 
@@ -53,6 +54,7 @@ internal override void InitializeContext(
     {
         _context = context;
         _typeInspector = context.TypeInspector;
+        ModifyOptions(context, o => o.Mode = TagMode.ApolloFederation);
     }
 
     public override void OnAfterInitialize(

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/CertificationSchema/AnnotationBased/__snapshots__/CertificationTests.Schema_Snapshot.snap

@@ -51,7 +51,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/CertificationSchema/AnnotationBased/__snapshots__/CertificationTests.Subgraph_SDL.snap

@@ -25,4 +25,4 @@ extend type User @key(fields: "email") {
   totalProductsCreated: Int @external
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/CertificationSchema/CodeFirst/__snapshots__/CertificationTests.Schema_Snapshot.snap

@@ -51,7 +51,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/CertificationSchema/CodeFirst/__snapshots__/CertificationTests.Subgraph_SDL.snap

@@ -25,4 +25,4 @@ extend type User @key(fields: "email") {
   totalProductsCreated: Int @external
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/ExternalDirectiveTests.AnnotateExternalToTypeFieldPureCodeFirst.snap

@@ -33,7 +33,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToClassAttributePureCodeFirst.snap

@@ -32,7 +32,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToClassAttributesPureCodeFirst.snap

@@ -33,7 +33,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToObjectTypePureCodeFirst.snap

@@ -32,7 +32,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/ProvidesDirectiveTests.AnnotateProvidesToClassAttributePureCodeFirst.snap

@@ -37,7 +37,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/RequiresDirectiveTests.AnnotateProvidesToClassAttributePureCodeFirst.snap

@@ -37,7 +37,7 @@ directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
 "Used to annotate the required input fieldset from a base type for a resolver."
 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 "The _Any scalar is used to pass representations of entities from external services into the root _entities field for execution. Validation of the _Any scalar is done by matching the __typename and @external fields defined in the schema."
 scalar _Any

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/FederationSchemaPrinterTests.TestFederationPrinterApolloDirectivesPureCodeFirst.snap

@@ -13,4 +13,4 @@ type User @key(fields: "id") {
   address: Address! @provides(fields: "zipcode")
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/FederationSchemaPrinterTests.TestFederationPrinterApolloDirectivesSchemaFirst.snap

@@ -7,4 +7,4 @@ type TestType @key(fields: "id") {
   name: String!
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/FederationSchemaPrinterTests.TestFederationPrinterSchemaFirst.snap

@@ -38,4 +38,4 @@ interface iTestType @key(fields: "id") {
   external: String! @external
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/FederationSchemaPrinterTests.TestFederationPrinterSchemaFirst_With_DateTime.snap

@@ -42,4 +42,4 @@ interface iTestType @key(fields: "id") {
   external: String! @external
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/FederationSchemaPrinterTests.TestFederationPrinterTypeExtensionPureCodeFirst.snap

@@ -6,4 +6,4 @@ type QueryRootOfProduct {
   entity(id: Int!): Product!
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/ServiceTypeTests.TestServiceTypeEmptyQueryTypePureCodeFirst.snap

@@ -2,4 +2,4 @@
   matchCode: String
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/ServiceTypeTests.TestServiceTypeEmptyQueryTypeSchemaFirst.snap

@@ -2,4 +2,4 @@
   matchCode: String!
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/ServiceTypeTests.TestServiceTypeTypePureCodeFirst.snap

@@ -6,4 +6,4 @@ type Query {
   address(id: Int!): Address!
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/__snapshots__/ServiceTypeTests.TestServiceTypeTypeSchemaFirst.snap

@@ -6,4 +6,4 @@ type Query {
   address: Address!
 }
 
-directive @tag(name: String!) repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION

src/HotChocolate/Core/src/Abstractions/WellKnownContextData.cs

@@ -279,4 +279,9 @@ public static class WellKnownContextData
     /// The key to access the true nullability flag on the execution context.
     /// </summary>
     public const string EnableTrueNullability = "HotChocolate.Types.EnableTrueNullability";
+
+    /// <summary>
+    /// The key to access the tag options object.
+    /// </summary>
+    public const string TagOptions = "HotChocolate.Types.TagOptions";
 }

src/HotChocolate/Core/src/Types/Types/Directives/Tag.cs

@@ -34,6 +34,7 @@ namespace HotChocolate.Types;
     DirectiveLocation.EnumValue |
     DirectiveLocation.Schema,
     IsRepeatable = true)]
+[TagDirectiveConfig]
 public sealed class Tag
 {
     /// <summary>
@@ -56,9 +57,9 @@ public Tag(string name)
 
         Name = name;
     }
-    
+
     /// <summary>
     /// The name of the tag.
     /// </summary>
     public string Name { get; }
-}
+}

src/HotChocolate/Core/src/Types/Types/Directives/TagDirectiveConfigAttribute.cs

@@ -0,0 +1,30 @@
+#nullable enable
+using System;
+using HotChocolate.Types.Descriptors;
+
+namespace HotChocolate.Types;
+
+internal sealed class TagDirectiveConfigAttribute : DirectiveTypeDescriptorAttribute
+{
+    protected override void OnConfigure(
+        IDescriptorContext context, 
+        IDirectiveTypeDescriptor descriptor, 
+        Type type)
+    {
+        if (context.ContextData.TryGetValue(WellKnownContextData.TagOptions, out var value) &&
+            value is TagOptions { Mode: TagMode.ApolloFederation })
+        {
+            descriptor.Extend().Definition.Locations =
+                DirectiveLocation.Object |
+                DirectiveLocation.Interface |
+                DirectiveLocation.Union |
+                DirectiveLocation.InputObject |
+                DirectiveLocation.Enum |
+                DirectiveLocation.Scalar |
+                DirectiveLocation.FieldDefinition |
+                DirectiveLocation.InputFieldDefinition |
+                DirectiveLocation.ArgumentDefinition |
+                DirectiveLocation.EnumValue;
+        }
+    }
+}

src/HotChocolate/Core/src/Types/Types/Directives/TagHelper.cs

@@ -0,0 +1,24 @@
+#nullable enable
+using System;
+using HotChocolate.Types.Descriptors;
+
+namespace HotChocolate.Types;
+
+internal static class TagHelper
+{
+    public static void ModifyOptions(IDescriptorContext context, Action<TagOptions> configure)
+    {
+        TagOptions? options = null;
+
+        if (context.ContextData.TryGetValue(WellKnownContextData.TagOptions, out var value) &&
+            value is TagOptions opt)
+        {
+            options = opt;
+        }
+
+        options ??= new TagOptions();
+        context.ContextData[WellKnownContextData.TagOptions] = options;
+        configure(options);
+    }
+
+}

src/HotChocolate/Core/src/Types/Types/Directives/TagMode.cs

@@ -0,0 +1,7 @@
+namespace HotChocolate.Types;
+
+internal enum TagMode
+{
+    GraphQLFusion,
+    ApolloFederation
+}

src/HotChocolate/Core/src/Types/Types/Directives/TagOptions.cs

@@ -0,0 +1,7 @@
+#nullable enable
+namespace HotChocolate.Types;
+
+internal sealed class TagOptions
+{
+    public TagMode Mode { get; set; } = TagMode.GraphQLFusion;
+}