Merge pull request #26 from graphql-dotnet/schema-printer-and-web-ext…

…ensions

Fix schema printer, add web extensions, improve attribute registration

src/GraphQL.Conventions/Adapters/Engine/GraphQLEngine.cs

@@ -125,6 +125,26 @@ public GraphQLEngine WithSubscription<TSubscription>()
             return this;
         }
 
+        public GraphQLEngine WithAttributesFromAssembly(System.Type assemblyType)
+        {
+            _typeResolver.RegisterAttributesInAssembly(assemblyType);
+            return this;
+        }
+
+        public GraphQLEngine WithAttributesFromAssembly<TAssemblyType>()
+        {
+            return WithAttributesFromAssembly(typeof(TAssemblyType));
+        }
+
+        public GraphQLEngine WithAttributesFromAssemblies(IEnumerable<System.Type> assemblyTypes)
+        {
+            foreach (var assemblyType in assemblyTypes)
+            {
+                WithAttributesFromAssembly(assemblyType);
+            }
+            return this;
+        }
+
         public GraphQLEngine BuildSchema(params System.Type[] types)
         {
             if (_schema == null)

src/GraphQL.Conventions/Attributes/Collectors/AttributeCollector.cs

@@ -5,11 +5,6 @@
 
 namespace GraphQL.Conventions.Attributes.Collectors
 {
-    public class AttributeCollector
-    {
-        public static Type ApplicationType { get; set; }
-    }
-
     public class AttributeCollector<TAttribute>
         where TAttribute : IAttribute
     {
@@ -53,10 +48,6 @@ public int CompareTo(WrappedAttribute other)
         public AttributeCollector()
         {
             DiscoverDefaultAttributes();
-            if (AttributeCollector.ApplicationType != null)
-            {
-                DiscoverDefaultAttributes(AttributeCollector.ApplicationType);
-            }
         }
 
         public List<TAttribute> CollectAttributes(ICustomAttributeProvider obj)
@@ -73,7 +64,7 @@ protected void AddDefaultAttributes(params TAttribute[] defaultAttributes)
             {
                 _defaultAttributes = new List<TAttribute>();
             }
-            _defaultAttributes.AddRange(defaultAttributes);
+            _defaultAttributes.AddRange(defaultAttributes.Except(_defaultAttributes));
         }
 
         protected virtual IEnumerable<TAttribute> CollectCoreAttributes(ICustomAttributeProvider obj)
@@ -86,7 +77,7 @@ private IEnumerable<WrappedAttribute> CollectAttributesImplementation(ICustomAtt
                 .Union(FlattenAttributeCollection(_defaultAttributes))
                 .Union(GetAttributes(obj));
 
-        private void DiscoverDefaultAttributes(Type assemblyType = null)
+        internal void DiscoverDefaultAttributes(Type assemblyType = null)
         {
             if (assemblyType == null)
             {
@@ -102,14 +93,6 @@ private void DiscoverDefaultAttributes(Type assemblyType = null)
             AddDefaultAttributes(defaultAttributes);
         }
 
-        private void DiscoverDefaultAttributes()
-        {
-            if (_defaultAttributes == null)
-            {
-                DiscoverDefaultAttributes(null);
-            }
-        }
-
         private bool IsDefaultAttribute(Type type)
         {
             return type.GetTypeInfo()

src/GraphQL.Conventions/CommonAssemblyInfo.cs

@@ -7,9 +7,9 @@
 [assembly: AssemblyProduct("GraphQL.Conventions")]
 [assembly: AssemblyCopyright("Copyright 2016-2017 Tommy Lillehagen. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.1.2.0")]
-[assembly: AssemblyFileVersion("1.1.2.0")]
-[assembly: AssemblyInformationalVersion("1.1.2.0")]
+[assembly: AssemblyVersion("1.1.3.0")]
+[assembly: AssemblyFileVersion("1.1.3.0")]
+[assembly: AssemblyInformationalVersion("1.1.3.0")]
 [assembly: CLSCompliant(false)]
 
 [assembly: InternalsVisibleTo("GraphQL.Conventions.Tests")]

src/GraphQL.Conventions/Handlers/MetaDataAttributeHandler.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Reflection;
 using GraphQL.Conventions.Attributes;
@@ -39,5 +40,10 @@ public void DeriveMetaData(GraphEntityInfo entity, ICustomAttributeProvider obj)
                 fieldInfo.ExecutionFilters.AddRange(_executionFilterCollector.CollectAttributes(obj));
             }
         }
+
+        internal void DiscoverAndRegisterDefaultAttributesInAssembly(Type assemblyType)
+        {
+            _collector.DiscoverDefaultAttributes(assemblyType);
+        }
     }
 }

src/GraphQL.Conventions/Types/Resolution/ObjectReflector.cs

@@ -132,6 +132,11 @@ public GraphEntityInfo ApplyAttributes(GraphEntityInfo entityInfo)
             return entityInfo;
         }
 
+        internal void DiscoverAndRegisterDefaultAttributesInAssembly(Type assemblyType)
+        {
+            _metaDataHandler.DiscoverAndRegisterDefaultAttributesInAssembly(assemblyType);
+        }
+
         private void DeriveInterfaces(GraphTypeInfo type)
         {
             var typeInfo = GetTypeInfo(type);

src/GraphQL.Conventions/Types/Resolution/TypeResolver.cs

@@ -56,6 +56,11 @@ public TypeRegistration LookupType(TypeInfo typeInfo)
             return null;
         }
 
+        public void RegisterAttributesInAssembly(Type assemblyType)
+        {
+            _reflector.DiscoverAndRegisterDefaultAttributesInAssembly(assemblyType);
+        }
+
         public IDependencyInjector DependencyInjector { get; set; }
 
         public GraphSchemaInfo ActiveSchema { get; set; }

src/GraphQL.Conventions/Web/Extensions.cs

@@ -0,0 +1,16 @@
+using System.IO;
+
+namespace GraphQL.Conventions.Web
+{
+    public static class Extensions
+    {
+        public static Request ToGraphQLRequest(this Stream stream) =>
+            Request.New(stream);
+
+        public static Response ToResponse(this ExecutionResult result, Request request, GraphQLEngine engine) =>
+            new Response(request, result, engine.SerializeResult(result));
+
+        public static string IdentifierForTypeOrNull<T>(this Id id) =>
+            id.IsIdentifierForType<T>() ? id.IdentifierForType<T>() : null;
+    }
+}

src/GraphQL.Conventions/Web/IRequestHandler.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace GraphQL.Conventions.Web
+{
+    public interface IRequestHandler
+    {
+        Task<Response> ProcessRequest(Request request, IUserContext userContext);
+
+        string DescribeSchema(bool returnJson = false);
+    }
+}

src/GraphQL.Conventions/Web/Request.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+
+namespace GraphQL.Conventions.Web
+{
+    public class Request
+    {
+        static readonly IRequestDeserializer _requestDeserializer = new RequestDeserializer();
+
+        static readonly Regex _regexSuperfluousWhitespace =
+            new Regex(@"[ \t\r\n]{1,}", RegexOptions.Multiline | RegexOptions.Compiled);
+
+        readonly string _queryId;
+
+        readonly QueryInput _queryInput;
+
+        readonly Exception _exception;
+
+        public static Request New(Stream stream)
+        {
+            stream.Seek(0, SeekOrigin.Begin);
+            var requestBody = new StreamReader(stream).ReadToEnd();
+            return New(requestBody);
+        }
+
+        public static Request New(string requestBody)
+        {
+            try
+            {
+                var queryInput = _requestDeserializer.GetQueryFromRequestBody(requestBody);
+                return New(queryInput);
+            }
+            catch (Exception ex)
+            {
+                return InvalidInput(ex);
+            }
+        }
+
+        public static Request New(QueryInput queryInput)
+        {
+            return new Request(queryInput);
+        }
+
+        public static Request InvalidInput(Exception exception)
+        {
+            return new Request(exception);
+        }
+
+        Request()
+        {
+            _queryId = Guid.NewGuid().ToString();
+        }
+
+        Request(QueryInput queryInput)
+            : this()
+        {
+            _queryInput = queryInput;
+        }
+
+        Request(Exception exception)
+            : this()
+        {
+            _exception = exception;
+        }
+
+        public string QueryId => _queryId;
+
+        public string QueryString => _queryInput?.QueryString ?? string.Empty;
+
+        public Dictionary<string, object> Variables => _queryInput?.Variables;
+
+        public string OperationName => _queryInput?.OperationName;
+
+        public bool IsValid => _exception == null;
+
+        public Exception Error => _exception;
+
+        public string MinifiedQueryString => MinifyString(QueryString);
+
+        public string MinifiedVariablesString => MinifyString(JsonConvert.SerializeObject(Variables));
+
+        static string MinifyString(string input)
+        {
+            if (input == null)
+            {
+                return string.Empty;
+            }
+            return _regexSuperfluousWhitespace.Replace(input, @" ").Trim();
+        }
+    }
+}