graphql-aspnet · kevin-carroll · Nov 26, 2023 · May 17, 2023 · May 20, 2023 · Jun 11, 2023
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -17,6 +17,7 @@ on:
  pull_request:
    branches:
      - master
+      - 'release/**'

 env: 
  SLN_PATH: ./src/graphql-aspnet.sln

diff --git a/src/ancillary-projects/starwars/starwars-common/GraphControllers/SearchController.cs b/src/ancillary-projects/starwars/starwars-common/GraphControllers/SearchController.cs
@@ -11,15 +11,12 @@ namespace GraphQL.AspNet.StarwarsAPI.Common.GraphControllers
 {
    using System.Collections.Generic;
    using System.ComponentModel;
-    using System.Linq;
    using System.Threading.Tasks;
    using GraphQL.AspNet.Attributes;
    using GraphQL.AspNet.Controllers;
    using GraphQL.AspNet.Interfaces.Controllers;
-    using GraphQL.AspNet.Schemas.TypeSystem;
    using GraphQL.AspNet.StarwarsAPI.Common.Model;
    using GraphQL.AspNet.StarwarsAPI.Common.Services;
-    using Microsoft.AspNetCore.Authorization;

    /// <summary>
    /// A controller to handle search queries across the spectrum of the star wars universe.
@@ -42,7 +39,7 @@ public SearchController(IStarWarsDataService starWarsData)
        /// </summary>
        /// <param name="searchText">The text to search for.</param>
        /// <returns>Task&lt;IGraphActionResult&gt;.</returns>
-        [QueryRoot("search","SearchResults", typeof(Droid), typeof(Human), typeof(Starship), TypeExpression = "[Type]")]
+        [QueryRoot("search", "SearchResults", typeof(Droid), typeof(Human), typeof(Starship), TypeExpression = "[Type]")]
        [Description("Searches for the specified text as the name of a starship or character (not case sensitive).")]
        public async Task<IGraphActionResult> GlobalSearch(string searchText = "*")
        {

diff --git a/src/ancillary-projects/starwars/starwars-common/GraphControllers/StarshipsController.cs b/src/ancillary-projects/starwars/starwars-common/GraphControllers/StarshipsController.cs
@@ -21,6 +21,8 @@ namespace GraphQL.AspNet.StarwarsAPI.Common.GraphControllers
    using GraphQL.AspNet.Interfaces.Controllers;
    using GraphQL.AspNet.StarwarsAPI.Common.Model;
    using GraphQL.AspNet.StarwarsAPI.Common.Services;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.DependencyInjection;

    /// <summary>
    /// A graph controller responsible for managing starship related data.
@@ -67,7 +69,6 @@ public async Task<IGraphActionResult> RetrieveStarship([FromGraphQL("id")] Graph
            return this.Ok(starship);
        }

-
        /// <summary>
        /// Retrieves a droid in the system by their id. Note the use of a different name for the parameter
        /// between its exposure in the object graph vs. the formal parameter name used in the C# code.

diff --git a/src/ancillary-projects/starwars/starwars-common/starwars-common.csproj b/src/ancillary-projects/starwars/starwars-common/starwars-common.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;netstandard2.0;</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;</TargetFrameworks>
    <LangVersion>latest</LangVersion>
    <NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603</NoWarn>
    <RootNamespace>GraphQL.AspNet.StarwarsAPI.Common</RootNamespace>

diff --git a/src/graphql-aspnet-subscriptions/Attributes/SubscriptionAttribute.cs b/src/graphql-aspnet-subscriptions/Attributes/SubscriptionAttribute.cs
@@ -82,7 +82,7 @@ public SubscriptionAttribute(string template, Type returnType)
        /// be sure to supply any additional concrete types so that they may be included in the object graph.</param>
        /// <param name="additionalTypes">Any additional types to include in the object graph on behalf of this method.</param>
        public SubscriptionAttribute(string template, Type returnType, params Type[] additionalTypes)
-            : base(false, SchemaItemCollections.Subscription, template, returnType.AsEnumerable().Concat(additionalTypes).ToArray())
+            : base(false, SchemaItemCollections.Subscription, template, (new Type[] { returnType }).Concat(additionalTypes ?? Enumerable.Empty<Type>()).ToArray())
        {
            this.EventName = null;
        }
@@ -93,15 +93,14 @@ public SubscriptionAttribute(string template, Type returnType, params Type[] add
        /// <param name="template">The template naming scheme to use to generate a graph field from this method.</param>
        /// <param name="unionTypeName">Name of the union type.</param>
        /// <param name="unionTypeA">The first of two required types to include in the union.</param>
-        /// <param name="unionTypeB">The second of two required types to include in the union.</param>
        /// <param name="additionalUnionTypes">Any additional union types to include.</param>
-        public SubscriptionAttribute(string template, string unionTypeName, Type unionTypeA, Type unionTypeB, params Type[] additionalUnionTypes)
+        public SubscriptionAttribute(string template, string unionTypeName, Type unionTypeA, params Type[] additionalUnionTypes)
         : base(
               false,
               SchemaItemCollections.Subscription,
               template,
               unionTypeName,
-               unionTypeA.AsEnumerable().Concat(unionTypeB.AsEnumerable()).Concat(additionalUnionTypes).ToArray())
+               new Type[] { unionTypeA }.Concat(additionalUnionTypes ?? Enumerable.Empty<Type>()).ToArray())
        {
            this.EventName = null;
        }

diff --git a/src/graphql-aspnet-subscriptions/Attributes/SubscriptionRootAttribute.cs b/src/graphql-aspnet-subscriptions/Attributes/SubscriptionRootAttribute.cs
@@ -82,7 +82,7 @@ public SubscriptionRootAttribute(string template, Type returnType)
        /// be sure to supply any additional concrete types so that they may be included in the object graph.</param>
        /// <param name="additionalTypes">Any additional types to include in the object graph on behalf of this method.</param>
        public SubscriptionRootAttribute(string template, Type returnType, params Type[] additionalTypes)
-            : base(true, SchemaItemCollections.Subscription, template, returnType.AsEnumerable().Concat(additionalTypes).ToArray())
+            : base(true, SchemaItemCollections.Subscription, template, (new Type[] { returnType }).Concat(additionalTypes ?? Enumerable.Empty<Type>()).ToArray())
        {
            this.EventName = null;
        }
@@ -93,15 +93,14 @@ public SubscriptionRootAttribute(string template, Type returnType, params Type[]
        /// <param name="template">The template naming scheme to use to generate a graph field from this method.</param>
        /// <param name="unionTypeName">Name of the union type.</param>
        /// <param name="unionTypeA">The first of two required types to include in the union.</param>
-        /// <param name="unionTypeB">The second of two required types to include in the union.</param>
        /// <param name="additionalUnionTypes">Any additional union types.</param>
-        public SubscriptionRootAttribute(string template, string unionTypeName, Type unionTypeA, Type unionTypeB, params Type[] additionalUnionTypes)
+        public SubscriptionRootAttribute(string template, string unionTypeName, Type unionTypeA, params Type[] additionalUnionTypes)
            : base(
                true,
                SchemaItemCollections.Subscription,
                template,
                unionTypeName,
-                unionTypeA.AsEnumerable().Concat(unionTypeB.AsEnumerable()).Concat(additionalUnionTypes).ToArray())
+                (new Type[] { unionTypeA }).Concat(additionalUnionTypes ?? Enumerable.Empty<Type>()).ToArray())
        {
            this.EventName = null;
        }

diff --git a/...hql-aspnet-subscriptions/Configuration/GraphQLRuntimeSubscriptionsDefinitionExtensions.cs b/...hql-aspnet-subscriptions/Configuration/GraphQLRuntimeSubscriptionsDefinitionExtensions.cs
@@ -0,0 +1,185 @@
+// *************************************************************
+// project:  graphql-aspnet
+// --
+// repo: https://github.com/graphql-aspnet
+// docs: https://graphql-aspnet.github.io
+// --
+// License:  MIT
+// *************************************************************
+
+namespace GraphQL.AspNet.Configuration
+{
+    using System;
+    using GraphQL.AspNet.Attributes;
+    using GraphQL.AspNet.Common;
+    using GraphQL.AspNet.Execution;
+    using GraphQL.AspNet.Interfaces.Configuration;
+    using GraphQL.AspNet.Interfaces.Schema.RuntimeDefinitions;
+    using GraphQL.AspNet.Schemas.Generation.RuntimeSchemaItemDefinitions;
+
+    /// <summary>
+    /// Extension methods for defining subscriptions via minimal api.
+    /// </summary>
+    public static partial class GraphQLRuntimeSubscriptionDefinitionExtensions
+    {
+        /// <summary>
+        /// Creates a new, explicitly resolvable field in the Subscription root object with the given path. This field cannot be
+        /// further extended or nested with other fields via the Mapping API.
+        /// </summary>
+        /// <param name="schemaBuilder">The builder representing the schema where this field
+        /// will be created.</param>
+        /// <param name="template">The template path string for his field. (e.g. <c>/path1/path2/path3</c>)</param>
+        /// <returns>IGraphQLFieldTemplate.</returns>
+        public static IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition MapSubscription(this ISchemaBuilder schemaBuilder, string template)
+        {
+            Validation.ThrowIfNull(schemaBuilder, nameof(schemaBuilder));
+
+            return MapSubscription(
+                schemaBuilder.Options,
+                template,
+                null, // unionName
+                null as Delegate);
+        }
+
+        /// <summary>
+        /// Creates a new field in the Subscription object with the given path. This field can act as a
+        /// grouping field of other resolvable fields or be converted to an explicitly resolvable field itself.
+        /// </summary>
+        /// <param name="schemaBuilder">The builder representing the schema where this field
+        /// will be created.</param>
+        /// <param name="template">The template path string for his field. (e.g. <c>/path1/path2/path3</c>)</param>
+        /// <param name="resolverMethod">The resolver method to execute when this
+        /// field is requested.</param>
+        /// <returns>IGraphQLFieldTemplate.</returns>
+        public static IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition MapSubscription(this ISchemaBuilder schemaBuilder, string template, Delegate resolverMethod)
+        {
+            Validation.ThrowIfNull(schemaBuilder, nameof(schemaBuilder));
+            return MapSubscription(
+                schemaBuilder.Options,
+                template,
+                null, // unionName
+                resolverMethod);
+        }
+
+        /// <summary>
+        /// Creates a new field in the Subscription object with the given path. This field can act as a
+        /// grouping field of other resolvable fields or be converted to an explicitly resolvable field itself.
+        /// </summary>
+        /// <param name="schemaBuilder">The builder representing the schema where this field
+        /// will be created.</param>
+        /// <param name="template">The template path string for his field. (e.g. <c>/path1/path2/path3</c>)</param>
+        /// <param name="unionName">Provide a name and this field will be declared to return a union. Use <see cref="GraphQLRuntimeSchemaItemDefinitionExtensions.AddPossibleTypes(IGraphQLRuntimeResolvedFieldDefinition, Type, Type[])"/> to declare union members.</param>
+        /// <param name="resolverMethod">The resolver method to execute when this
+        /// field is requested.</param>
+        /// <returns>IGraphQLFieldTemplate.</returns>
+        public static IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition MapSubscription(
+            this ISchemaBuilder schemaBuilder,
+            string template,
+            string unionName,
+            Delegate resolverMethod)
+        {
+            Validation.ThrowIfNull(schemaBuilder, nameof(schemaBuilder));
+
+            return MapSubscription(
+                schemaBuilder.Options,
+                template,
+                unionName,
+                resolverMethod);
+        }
+
+        /// <summary>
+        /// Creates a new field in the Subscription root object with the given path. This field can act as a
+        /// grouping field of other resolvable fields or be converted to an explicitly resolvable field itself.
+        /// </summary>
+        /// <param name="schemaOptions">The options representing the schema where this field
+        /// will be created.</param>
+        /// <param name="template">The template path string for his field. (e.g. <c>/path1/path2/path3</c>)</param>
+        /// <returns>IGraphQLFieldTemplate.</returns>
+        public static IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition MapSubscription(
+            this SchemaOptions schemaOptions,
+            string template)
+        {
+            return MapSubscription(
+                schemaOptions,
+                template,
+                null, // unionMethod
+                null as Delegate);
+        }
+
+        /// <summary>
+        /// Creates a new, explicitly resolvable field in the Subscription root object with the given path. This field cannot be
+        /// further extended or nested with other fields via the Mapping API.
+        /// </summary>
+        /// <param name="schemaOptions">The options representing the schema where this field
+        /// will be created.</param>
+        /// <param name="template">The template path string for his field. (e.g. <c>/path1/path2/path3</c>)</param>
+        /// <param name="resolverMethod">The resolver method to execute when
+        /// this field is requested by a caller.</param>
+        /// <returns>IGraphQLResolvedFieldTemplate.</returns>
+        public static IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition MapSubscription(
+            this SchemaOptions schemaOptions,
+            string template,
+            Delegate resolverMethod)
+        {
+            return MapSubscription(
+                schemaOptions,
+                template,
+                null, // unionMethod
+                resolverMethod);
+        }
+
+        /// <summary>
+        /// Creates a new, explicitly resolvable field in the Subscription root object with the given path. This field cannot be
+        /// further extended or nested with other fields via the Mapping API.
+        /// </summary>
+        /// <param name="schemaOptions">The options representing the schema where this field
+        /// will be created.</param>
+        /// <param name="template">The template path string for his field. (e.g. <c>/path1/path2/path3</c>)</param>
+        /// <param name="unionName">Provide a name and this field will be declared to return a union. Use <see cref="GraphQLRuntimeSchemaItemDefinitionExtensions.AddPossibleTypes(IGraphQLRuntimeResolvedFieldDefinition, Type, Type[])"/> to declare union members.</param>
+        /// <param name="resolverMethod">The resolver method to execute when
+        /// this field is requested by a caller.</param>
+        /// <returns>IGraphQLResolvedFieldTemplate.</returns>
+        public static IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition MapSubscription(
+            this SchemaOptions schemaOptions,
+            string template,
+            string unionName,
+            Delegate resolverMethod)
+        {
+            schemaOptions = Validation.ThrowIfNullOrReturn(schemaOptions, nameof(schemaOptions));
+            template = Validation.ThrowIfNullWhiteSpaceOrReturn(template, nameof(template));
+
+            var fieldTemplate = new RuntimeSubscriptionEnabledFieldGroupTemplate(
+                schemaOptions,
+                template);
+
+            var resolvedField = RuntimeSubscriptionEnabledResolvedFieldDefinition.FromFieldTemplate(fieldTemplate);
+            schemaOptions.AddRuntimeSchemaItem(resolvedField);
+
+            if (!string.IsNullOrWhiteSpace(unionName))
+                resolvedField.AddAttribute(new UnionAttribute(unionName.Trim()));
+
+            resolvedField.AddResolver(unionName, resolverMethod);
+
+            schemaOptions.ServiceCollection?.AddSubscriptionRuntimeFieldExecutionSupport();
+            return resolvedField;
+        }
+
+        /// <summary>
+        /// Defines a custom event name for this subscription field. This event name is the key value
+        /// that must be published from a mutation to invoke this subscription for any subscribers.
+        /// </summary>
+        /// <remarks>
+        /// This event name must be unique for this schema.
+        /// </remarks>
+        /// <param name="field">The field to update.</param>
+        /// <param name="eventName">Name of the event.</param>
+        /// <returns>IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition.</returns>
+        public static IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition WithEventName(
+            this IGraphQLSubscriptionEnabledRuntimeResolvedFieldDefinition field,
+            string eventName)
+        {
+            field.EventName = eventName;
+            return field;
+        }
+    }
+}