Migrated spatial types to new type system core.

.build/Helpers.cs

@@ -17,7 +17,8 @@ class Helpers
         Path.Combine("HotChocolate", "PersistedQueries"),
         Path.Combine("HotChocolate", "Utilities"),
         Path.Combine("HotChocolate", "Data"),
-        Path.Combine("HotChocolate", "Filters")
+        Path.Combine("HotChocolate", "Filters"),
+        Path.Combine("HotChocolate", "Spatial")
     };
 
     public static IEnumerable<string> GetAllProjects(string sourceDirectory)

src/HotChocolate/Core/src/Types/Types/EnumType.cs

@@ -220,6 +220,5 @@ public bool TryDeserialize(object? resultValue, out object? runtimeValue)
             runtimeValue = null;
             return false;
         }
-
     }
 }

src/HotChocolate/Core/src/Types/Types/Scalars/IdType.cs

@@ -88,7 +88,7 @@ public override IValueNode ParseValue(object? runtimeValue)
         {
             if (runtimeValue is null)
             {
-                return new NullValueNode(null);
+                return NullValueNode.Default;
             }
 
             if (runtimeValue is string s)
@@ -105,7 +105,7 @@ public override IValueNode ParseResult(object? resultValue)
         {
             if (resultValue is null)
             {
-                return new NullValueNode(null);
+                return NullValueNode.Default;
             }
 
             if (resultValue is string s)

src/HotChocolate/Core/test/Utilities/TestHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Execution;
@@ -203,4 +203,4 @@ public static void AddDefaultConfiguration(IRequestExecutorBuilder builder)
                 .AddStarWarsRepositories();
         }
     }
-}
+}

src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/Comparable/QueryableComparableInHandler.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq.Expressions;
 using HotChocolate.Language;
+using HotChocolate.Types.Descriptors;
 using HotChocolate.Utilities;
 
 namespace HotChocolate.Data.Filters.Expressions
@@ -32,11 +33,9 @@ public class QueryableComparableInHandler
             }
 
             return FilterExpressionBuilder.In(
-                    property,
-                    context.RuntimeTypes.Peek().Source,
-                    parsedValue);
-
-            throw new InvalidOperationException();
+                property,
+                context.RuntimeTypes.Peek().Source,
+                parsedValue);
         }
     }
 }

src/HotChocolate/Data/src/Data/Filters/Expressions/QueryableFilterProvider.cs

@@ -12,6 +12,8 @@ namespace HotChocolate.Data.Filters.Expressions
     public class QueryableFilterProvider
         : FilterProvider<QueryableFilterContext>
     {
+        public static readonly string ContextDataKeys = nameof(QueryableFilterProvider);
+
         public QueryableFilterProvider()
         {
         }
@@ -36,9 +38,13 @@ public override FieldMiddleware CreateExecutor<TEntityType>(NameString argumentN
                 // first we let the pipeline run and produce a result.
                 await next(context).ConfigureAwait(false);
 
-                // next we get the filter argument.
+                // next we get the filter argument. If the filter argument is already on the context
+                // we use this. This enabled overriding the context with LocalContextData
                 IInputField argument = context.Field.Arguments[argumentName];
-                IValueNode filter = context.ArgumentLiteral<IValueNode>(argumentName);
+                IValueNode filter = context.LocalContextData.ContainsKey(ContextDataKeys) &&
+                    context.LocalContextData[ContextDataKeys] is IValueNode node
+                        ? node
+                        : context.ArgumentLiteral<IValueNode>(argumentName);
 
                 // if no filter is defined we can stop here and yield back control.
                 if (filter.IsNull())
@@ -60,7 +66,8 @@ public override FieldMiddleware CreateExecutor<TEntityType>(NameString argumentN
                 if (source != null && argument.Type is IFilterInputType filterInput)
                 {
                     var visitorContext = new QueryableFilterContext(
-                        filterInput, source is EnumerableQuery);
+                        filterInput,
+                        source is EnumerableQuery);
 
                     // rewrite GraphQL input object into expression tree.
                     Visitor.Visit(filter, visitorContext);