Composition Improvements

src/CookieCrumble/src/CookieCrumble/Extensions/SnapshotExtensions.cs

@@ -12,6 +12,12 @@ public static void MatchInlineSnapshot(
  string snapshot,
  ISnapshotValueFormatter? formatter = null)
  => Snapshot.Create().Add(value, formatter: formatter).MatchInline(snapshot);
+
+ public static async Task MatchInlineSnapshotAsync<T>(
+ this Task<T> value,
+ string snapshot,
+ ISnapshotValueFormatter? formatter = null)
+ => Snapshot.Create().Add(await value, formatter: formatter).MatchInline(snapshot);
 
  public static void MatchSnapshot(this Snapshot value)
  => value.Match();

src/HotChocolate/Core/src/Abstractions/Types/ITypeSystemMember.cs

@@ -4,4 +4,4 @@ namespace HotChocolate.Types;
 /// This marker interface identifies member of the type system like
 /// types, directives, the schema or fields and arguments.
 /// </summary>
-public interface ITypeSystemMember { }
+public interface ITypeSystemMember;

src/HotChocolate/Diagnostics/src/Diagnostics/InstrumentationOptions.cs

@@ -21,8 +21,7 @@ public sealed class InstrumentationOptions
  /// Specifies if the parsed document shall be included into the tracing data.
  /// </summary>
  public bool IncludeDocument { get; set; }
-
-
+
  /// <summary>
  /// Specifies if DataLoader batch keys shall included into the tracing data.
  /// </summary>

src/HotChocolate/Fusion/src/Abstractions/FusionDirectiveArgumentNames.cs

@@ -5,15 +5,30 @@ namespace HotChocolate.Fusion;
 /// </summary>
 internal static class FusionDirectiveArgumentNames
 {
+ /// <summary>
+ /// Gets the name of the variable argument.
+ /// </summary>
+ public const string VariableArg = "variable";
+
  /// <summary>
  /// Gets the name of the name argument.
  /// </summary>
  public const string NameArg = "name";
+
+ /// <summary>
+ /// Gets the name of the newName argument.
+ /// </summary>
+ public const string NewNameArg = "newName";
 
  /// <summary>
  /// Gets the name of the client grouping argument.
  /// </summary>
- public const string ClientGroupArg = "group";
+ public const string GroupArg = "group";
+
+ /// <summary>
+ /// Gets the name of the field argument.
+ /// </summary>
+ public const string FieldArg = "field";
 
  /// <summary>
  /// Gets the name of the select argument.
@@ -44,12 +59,22 @@ internal static class FusionDirectiveArgumentNames
  /// Gets the name of the subgraph argument.
  /// </summary>
  public const string SubgraphArg = "subgraph";
+
+ /// <summary>
+ /// Gets the name of the subgraph argument.
+ /// </summary>
+ public const string FromArg = "from";
 
  /// <summary>
  /// Gets the name of the kind argument.
  /// </summary>
  public const string KindArg = "kind";
 
+ /// <summary>
+ /// Gets the name of the operation argument.
+ /// </summary>
+ public const string OperationArg = "operation";
+
  /// <summary>
  /// Gets the name of the prefix argument.
  /// </summary>
@@ -69,4 +94,9 @@ internal static class FusionDirectiveArgumentNames
  /// Gets the name of the location argument.
  /// </summary>
  public const string LocationArg = "location";
+
+ /// <summary>
+ /// Gets the name of the coordinate argument.
+ /// </summary>
+ public const string CoordinateArg = "coordinate";
 }

src/HotChocolate/Fusion/src/Abstractions/FusionTypeBaseNames.cs

@@ -6,59 +6,104 @@ namespace HotChocolate.Fusion;
 internal static class FusionTypeBaseNames
 {
  /// <summary>
- /// The base name of the variable directive.
+ /// The base name of the ArgumentDefinition input.
  /// </summary>
- public const string VariableDirective = "variable";
+ public const string ArgumentDefinition = "ArgumentDefinition";
 
  /// <summary>
- /// The base name of the resolver directive.
+ /// The base name of the declare directive.
  /// </summary>
- public const string ResolverDirective = "resolver";
+ public const string DeclareDirective = "declare";
 
  /// <summary>
- /// The base name of the source directive.
+ /// The base name of the fusion directive.
  /// </summary>
- public const string SourceDirective = "source";
+ public const string FusionDirective = "fusion";
 
  /// <summary>
- /// The base name of the is directive.
+ /// The base name of the is directive which is used during composition.
  /// </summary>
  public const string IsDirective = "is";
 
+ /// <summary>
+ /// The base name of the GraphQL name scalar.
+ /// </summary>
+ public const string Name = "TypeName";
+
  /// <summary>
  /// The base name of the node directive.
  /// </summary>
  public static string NodeDirective = "node";
 
+ /// <summary>
+ /// The base name of the GraphQL operation definition scalar.
+ /// </summary>
+ public const string OperationDefinition = "OperationDefinition";
+
+ /// <summary>
+ /// The base name of the private directive which is used during composition.
+ /// </summary>
+ public const string PrivateDirective = "private";
+
  /// <summary>
  /// The base name of the reEncodeId directive.
  /// </summary>
  public static string ReEncodeIdDirective = "reEncodeId";
 
  /// <summary>
- /// The base name of the transport directive.
+ /// The base name of the remove directive.
  /// </summary>
- public const string TransportDirective = "transport";
+ public const string RemoveDirective = "remove";
+
+ /// <summary>
+ /// The base name of the rename directive.
+ /// </summary>
+ public const string RenameDirective = "rename";
 
  /// <summary>
- /// The base name of the fusion directive.
+ /// The base name of the resolver directive.
  /// </summary>
- public const string FusionDirective = "fusion";
+ public const string ResolverDirective = "resolver";
+
+ /// <summary>
+ /// The base name of the ResolverKind input.
+ /// </summary>
+ public const string ResolverKind = "ResolverKind";
+
+ /// <summary>
+ /// The base name for the resolve directive which is used during composition.
+ /// </summary>
+ public const string ResolveDirective = "resolve";
 
  /// <summary>
- /// The base name of the GraphQL selection directive.
+ /// The base name of the require directive.
+ /// </summary>
+ public const string RequireDirective = "require"; // Note: the value seems to be a mistake as it's the same as RenameDirective's value.
+
+ /// <summary>
+ /// The base name of the GraphQL selection scalar.
  /// </summary>
  public const string Selection = "Selection";
 
  /// <summary>
- /// The base name of the GraphQL selection set directive.
+ /// The base name of the GraphQL selection set scalar.
  /// </summary>
  public const string SelectionSet = "SelectionSet";
 
  /// <summary>
- /// The base name of the GraphQL type name scalar.
+ /// The base name of the schema coordinate type.
  /// </summary>
- public const string TypeName = "TypeName";
+ public const string SchemaCoordinate = "SchemaCoordinate";
+
+ /// <summary>
+ /// The base name of the source directive.
+ /// </summary>
+ public const string SourceDirective = "source";
+
+ /// <summary>
+ /// The base name of the transport directive.
+ /// </summary>
+ public const string TransportDirective = "transport";
 
  /// <summary>
  /// The base name of the GraphQL type scalar.
@@ -71,13 +116,9 @@ internal static class FusionTypeBaseNames
  public const string Uri = "Uri";
 
  /// <summary>
- /// The base name of the ArgumentDefinition input.
- /// </summary>
- public const string ArgumentDefinition = "ArgumentDefinition";
-
- /// <summary>
- /// The base name of the ResolverKind input.
+ /// The base name of the variable directive.
  /// </summary>
- public const string ResolverKind = "ResolverKind";
+ public const string VariableDirective = "variable";
 }
 
+