Handle Umbraco.Grid data type

Author: benjaminc

src/Our.Umbraco.GraphQL/Adapters/PublishedContent/Types/PublishedPropertyFieldType.cs

@@ -30,7 +30,7 @@ public PublishedPropertyFieldType(IPublishedContentType contentType, PropertyTyp
                 unwrappedTypeInfo = typeof(IPublishedElement).GetTypeInfo();
 
             var propertyGraphType = typeRegistry.Get(unwrappedTypeInfo) ?? typeof(StringGraphType).GetTypeInfo();
-            propertyGraphType = propertyGraphType.Wrap(type, propertyType.Mandatory, false);
+            propertyGraphType = propertyGraphType.Wrap(type, propertyType.Mandatory, false, propertyType.PropertyEditorAlias != global::Umbraco.Core.Constants.PropertyEditors.Aliases.Grid);
 
             if (propertyType.VariesByCulture())
             {
@@ -44,8 +44,11 @@ public PublishedPropertyFieldType(IPublishedContentType contentType, PropertyTyp
             Name = publishedPropertyType.Alias.ToCamelCase();
             Description = propertyType.Description;
             Resolver = new FuncFieldResolver<IPublishedElement, object>(context =>
-                context.Source.Value(propertyType.Alias, context.GetArgument<string>("culture"),
-                    fallback: Fallback.ToLanguage));
+            {
+                var val = context.Source.Value(propertyType.Alias, context.GetArgument<string>("culture"),
+                    fallback: Fallback.ToLanguage);
+                return val;
+            });
         }
     }
 }

src/Our.Umbraco.GraphQL/Reflection/TypeInfoExtensions.cs

@@ -38,12 +38,12 @@ public static TypeInfo Unwrap(this TypeInfo typeInfo)
             return enumerableArgument != null ? enumerableArgument.GetTypeInfo() : typeInfo;
         }
 
-        public static TypeInfo Wrap(this TypeInfo graphType, TypeInfo typeInfo, bool isNonNull, bool isNonNullItem)
+        public static TypeInfo Wrap(this TypeInfo graphType, TypeInfo typeInfo, bool isNonNull, bool isNonNullItem, bool checkEnumerable = true)
         {
             if (graphType == null)
                 return null;
 
-            var enumerableArgument = GetEnumerableArgument(typeInfo);
+            var enumerableArgument = checkEnumerable ? GetEnumerableArgument(typeInfo) : null;
 
             if (typeInfo.IsValueType && typeInfo.IsNullable() == false || enumerableArgument != null &&
                 (enumerableArgument.IsValueType && enumerableArgument.IsNullable() == false || isNonNullItem))