Integrated projections into new configuration API

ChilliCream · Oct 18, 2020 · 014784c · 014784c
1 parent baef95e
commit 014784c
Show file tree

Hide file tree

Showing 13 changed files with 126 additions and 102 deletions.
diff --git a/src/HotChocolate/Data/src/Data/Extensions/HotChocolateDataRequestBuilderExtensions.cs b/src/HotChocolate/Data/src/Data/Extensions/HotChocolateDataRequestBuilderExtensions.cs
@@ -1,5 +1,7 @@
 using System;
+using HotChocolate;
 using HotChocolate.Data.Filters;
+using HotChocolate.Data.Projections;
 using HotChocolate.Data.Sorting;
 using HotChocolate.Execution.Configuration;
 
@@ -119,5 +121,66 @@ public static class HotChocolateDataRequestBuilderExtensions
             string? name = null)
             where TConvention : class, ISortConvention =>
             builder.ConfigureSchema(s => s.AddSorting<TConvention>(name));
+
+        /// <summary>
+        /// Adds filtering support.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="IRequestExecutorBuilder"/>.
+        /// </param>
+        /// <returns>
+        /// Returns the <see cref="IRequestExecutorBuilder"/>.
+        /// </returns>
+        public static IRequestExecutorBuilder AddProjections(
+            this IRequestExecutorBuilder builder) =>
+            AddProjections(builder, x => x.AddDefaults());
+
+        /// <summary>
+        /// Adds filtering support.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="IRequestExecutorBuilder"/>.
+        /// </param>
+        /// <param name="configure">
+        /// Configures the convention.
+        /// </param>
+        /// <param name="name">
+        /// The filter convention name.
+        /// </param>
+        /// <returns>
+        /// Returns the <see cref="IRequestExecutorBuilder"/>.
+        /// </returns>
+        public static IRequestExecutorBuilder AddProjections(
+            this IRequestExecutorBuilder builder,
+            Action<IProjectionConventionDescriptor> configure,
+            string? name = null) =>
+            builder.ConfigureSchema(s => s
+                .TryAddTypeInterceptor<ProjectionTypeInterceptor>()
+                .TryAddConvention<IProjectionConvention>(
+                    sp => new ProjectionConvention(configure),
+                    name));
+
+        /// <summary>
+        /// Adds filtering support.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="IRequestExecutorBuilder"/>.
+        /// </param>
+        /// <param name="name">
+        /// The filter convention name.
+        /// </param>
+        /// <typeparam name="TConvention">
+        /// The concrete filter convention type.
+        /// </typeparam>
+        /// <returns>
+        /// Returns the <see cref="IRequestExecutorBuilder"/>.
+        /// </returns>
+        public static IRequestExecutorBuilder AddProjections<TConvention>(
+            this IRequestExecutorBuilder builder,
+            string? name = null)
+            where TConvention : class, IProjectionConvention =>
+            builder.ConfigureSchema(s => s
+                .TryAddTypeInterceptor<ProjectionTypeInterceptor>()
+                .TryAddConvention<IProjectionConvention, TConvention>(name));
     }
 }
diff --git a/src/HotChocolate/Data/src/Data/Filters/Extensions/FilterFieldDescriptorExtensions.cs b/src/HotChocolate/Data/src/Data/Filters/Extensions/FilterFieldDescriptorExtensions.cs
@@ -1,9 +1,10 @@
 using System;
+using HotChocolate.Data.Filters;
 using HotChocolate.Language;
 using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
 
-namespace HotChocolate.Data.Filters
+namespace HotChocolate.Types
 {
     public static class FilterFieldDescriptorExtensions
     {

diff --git a/src/HotChocolate/Data/src/Data/Filters/Extensions/FilterFieldExtensions.cs b/src/HotChocolate/Data/src/Data/Filters/Extensions/FilterFieldExtensions.cs
diff --git a/src/HotChocolate/Data/src/Data/Filters/Extensions/FilterObjectFieldDescriptorExtensions.cs b/src/HotChocolate/Data/src/Data/Filters/Extensions/FilterObjectFieldDescriptorExtensions.cs
@@ -11,7 +11,7 @@
 using static HotChocolate.Data.DataResources;
 using static HotChocolate.Data.ThrowHelper;
 
-namespace HotChocolate.Data
+namespace HotChocolate.Types
 {
     public static class FilterObjectFieldDescriptorExtensions
     {

diff --git a/...ers/Extensions/SchemaBuilderExtensions.cs → ...tensions/FilterSchemaBuilderExtensions.cs b/...ers/Extensions/SchemaBuilderExtensions.cs → ...tensions/FilterSchemaBuilderExtensions.cs
@@ -1,11 +1,12 @@
 using System;
+using HotChocolate.Data.Filters;
 
-namespace HotChocolate.Data.Filters
+namespace HotChocolate
 {
     /// <summary>
     /// Provides filtering extensions for the <see cref="ISchemaBuilder"/>.
     /// </summary>
-    public static class SchemaBuilderExtensions
+    public static class FilterSchemaBuilderExtensions
     {
         /// <summary>
         /// Adds filtering support.

diff --git a/src/HotChocolate/Data/src/Data/Filters/Types/ComparableOperationFilterInput.cs b/src/HotChocolate/Data/src/Data/Filters/Types/ComparableOperationFilterInput.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Types;
 
 namespace HotChocolate.Data.Filters
 {

diff --git a/src/HotChocolate/Data/src/Data/Filters/Types/EnumOperationFilterInput.cs b/src/HotChocolate/Data/src/Data/Filters/Types/EnumOperationFilterInput.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Types;
 
 namespace HotChocolate.Data.Filters
 {

diff --git a/...ons/Extensions/SchemaBuilderExtensions.cs → ...ons/ProjectionsSchemaBuilderExtensions.cs b/...ons/Extensions/SchemaBuilderExtensions.cs → ...ons/ProjectionsSchemaBuilderExtensions.cs
@@ -1,11 +1,12 @@
 using System;
+using HotChocolate.Data.Projections;
 
-namespace HotChocolate.Data.Projections
+namespace HotChocolate
 {
     /// <summary>
     /// Provides filtering extensions for the <see cref="ISchemaBuilder"/>.
     /// </summary>
-    public static class SchemaBuilderExtensions
+    public static class ProjectionsSchemaBuilderExtensions
     {
         /// <summary>
         /// Adds filtering support.

diff --git a/...hocolate/Data/src/Data/Projections/Extensions/SelectionObjectFieldDescriptorExtensions.cs b/...hocolate/Data/src/Data/Projections/Extensions/SelectionObjectFieldDescriptorExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using HotChocolate.Configuration;
@@ -9,55 +8,11 @@
 using HotChocolate.Types.Descriptors.Definitions;
 using HotChocolate.Data.Projections;
 using HotChocolate.Execution;
-using HotChocolate.Execution.Processing;
-using HotChocolate.Language;
 using static HotChocolate.Data.Projections.ProjectionProvider;
 using static HotChocolate.Execution.Processing.SelectionOptimizerHelper;
 
 namespace HotChocolate.Types
 {
-    public class ProjectionOptimizer : ISelectionOptimizer
-    {
-        private readonly IProjectionProvider _convention;
-
-        public ProjectionOptimizer(
-            IProjectionProvider convention)
-        {
-            _convention = convention;
-        }
-
-        public void OptimizeSelectionSet(SelectionOptimizerContext context)
-        {
-            var processedFields = new HashSet<string>();
-            while (!processedFields.SetEquals(context.Fields.Keys))
-            {
-                var fieldsToProcess = new HashSet<string>(context.Fields.Keys);
-                fieldsToProcess.ExceptWith(processedFields);
-                foreach (var field in fieldsToProcess)
-                {
-                    context.Fields[field] =
-                        _convention.RewriteSelection(context, context.Fields[field]);
-                    processedFields.Add(field);
-                }
-            }
-        }
-
-        public bool AllowFragmentDeferral(
-            SelectionOptimizerContext context,
-            InlineFragmentNode fragment)
-        {
-            return false;
-        }
-
-        public bool AllowFragmentDeferral(
-            SelectionOptimizerContext context,
-            FragmentSpreadNode fragmentSpread,
-            FragmentDefinitionNode fragmentDefinition)
-        {
-            return false;
-        }
-    }
-
     public static class ProjectionObjectFieldDescriptorExtensions
     {
         private static readonly MethodInfo _factoryTemplate =

diff --git a/src/HotChocolate/Data/src/Data/Projections/ProjectionOptimizer.cs b/src/HotChocolate/Data/src/Data/Projections/ProjectionOptimizer.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using HotChocolate.Execution.Processing;
+using HotChocolate.Language;
+
+namespace HotChocolate.Data.Projections
+{
+    public class ProjectionOptimizer : ISelectionOptimizer
+    {
+        private readonly IProjectionProvider _convention;
+
+        public ProjectionOptimizer(
+            IProjectionProvider convention)
+        {
+            _convention = convention;
+        }
+
+        public void OptimizeSelectionSet(SelectionOptimizerContext context)
+        {
+            var processedFields = new HashSet<string>();
+            while (!processedFields.SetEquals(context.Fields.Keys))
+            {
+                var fieldsToProcess = new HashSet<string>(context.Fields.Keys);
+                fieldsToProcess.ExceptWith(processedFields);
+                foreach (var field in fieldsToProcess)
+                {
+                    context.Fields[field] =
+                        _convention.RewriteSelection(context, context.Fields[field]);
+                    processedFields.Add(field);
+                }
+            }
+        }
+
+        public bool AllowFragmentDeferral(
+            SelectionOptimizerContext context,
+            InlineFragmentNode fragment)
+        {
+            return false;
+        }
+
+        public bool AllowFragmentDeferral(
+            SelectionOptimizerContext context,
+            FragmentSpreadNode fragmentSpread,
+            FragmentDefinitionNode fragmentDefinition)
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortFieldExtensions.cs b/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortFieldExtensions.cs
diff --git a/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortObjectFieldDescriptorExtensions.cs b/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortObjectFieldDescriptorExtensions.cs
@@ -5,13 +5,12 @@
 using HotChocolate.Data.Sorting;
 using HotChocolate.Internal;
 using HotChocolate.Resolvers;
-using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
 using HotChocolate.Types.Descriptors.Definitions;
 using static HotChocolate.Data.DataResources;
 using static HotChocolate.Data.ThrowHelper;
 
-namespace HotChocolate.Data
+namespace HotChocolate.Types
 {
     public static class SortObjectFieldDescriptorExtensions
     {

diff --git a/...ing/Extensions/SchemaBuilderExtensions.cs → ...ensions/SortingSchemaBuilderExtensions.cs b/...ing/Extensions/SchemaBuilderExtensions.cs → ...ensions/SortingSchemaBuilderExtensions.cs
@@ -1,11 +1,12 @@
 using System;
+using HotChocolate.Data.Sorting;
 
-namespace HotChocolate.Data.Sorting
+namespace HotChocolate
 {
     /// <summary>
     /// Provides Sorting extensions for the <see cref="ISchemaBuilder"/>.
     /// </summary>
-    public static class SchemaBuilderExtensions
+    public static class SortingSchemaBuilderExtensions
     {
         /// <summary>
         /// Adds Sorting support.