Refactored DataLoader

Author: michaelstaib

src/GreenDonut/src/Core/DataLoaderFetchContext.cs

@@ -142,7 +142,7 @@ public TState GetStateOrDefault<TState>(string key, TState defaultValue)
     /// </returns>
     public ISelectorBuilder GetSelector()
     {
-        if (ContextData.TryGetValue(typeof(ISelectorBuilder).FullName!, out var value)
+        if (ContextData.TryGetValue(DataStateKeys.Selector, out var value)
             && value is ISelectorBuilder casted)
         {
             return casted;
@@ -162,8 +162,8 @@ public ISelectorBuilder GetSelector()
     /// </returns>
     public IPredicateBuilder GetPredicate()
     {
-        if (ContextData.TryGetValue(typeof(IPredicateBuilder).FullName!, out var value)
-            && value is DefaultPredicateBuilder casted)
+        if (ContextData.TryGetValue(DataStateKeys.Predicate, out var value)
+            && value is IPredicateBuilder casted)
         {
             return casted;
         }
@@ -172,4 +172,45 @@ public IPredicateBuilder GetPredicate()
         // a new default predicate builder.
         return DefaultPredicateBuilder.Empty;
     }
+
+    public SortDefinition<T> GetSorting<T>()
+    {
+        if (ContextData.TryGetValue(DataStateKeys.Sorting, out var value)
+            && value is SortDefinition<T> casted)
+        {
+            return casted;
+        }
+
+        return SortDefinition<T>.Empty;
+    }
+
+    public QueryContext<T> GetQueryContext<T>()
+    {
+        ISelectorBuilder? selector = null;
+        IPredicateBuilder? predicate = null;
+        SortDefinition<T>? sorting = null;
+
+        if (ContextData.TryGetValue(DataStateKeys.Selector, out var value)
+            && value is ISelectorBuilder casted1)
+        {
+            selector = casted1;
+        }
+
+        if (ContextData.TryGetValue(DataStateKeys.Predicate, out value)
+            && value is IPredicateBuilder casted2)
+        {
+            predicate = casted2;
+        }
+
+        if (ContextData.TryGetValue(DataStateKeys.Sorting, out value)
+            && value is SortDefinition<T> casted3)
+        {
+            sorting = casted3;
+        }
+
+        return new QueryContext<T>(
+            selector?.TryCompile<T>(),
+            predicate?.TryCompile<T>(),
+            sorting);
+    }
 }

src/GreenDonut/src/Core/GreenDonut.csproj

@@ -30,9 +30,4 @@
     <ProjectReference Include="..\Data.Primitives\GreenDonut.Data.Primitives.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Predicates\" />
-    <Folder Include="Selectors\" />
-  </ItemGroup>
-
 </Project>

src/HotChocolate/Core/src/Types.Analyzers/FileBuilders/DataLoaderFileBuilder.cs

@@ -314,7 +314,8 @@ public void WriteDataLoaderLoadMethod(
                         ((INamedTypeSymbol)parameter.Type).TypeArguments[0].ToFullyQualified(),
                         DataLoaderInfo.Sorting);
                     _writer.WriteIndentedLine(
-                        "var {0} = new global::{1}<{2}>({0}_selector, {0}_predicate, {0}_sortDefinition);",
+                        "var {0} = new global::{1}<{2}>({0}_selector?.TryCompile<{2}>(), " +
+                        "{0}_predicate?.TryCompile<{2}>(), {0}_sortDefinition);",
                         parameter.VariableName,
                         WellKnownTypes.QueryContext,
                         ((INamedTypeSymbol)parameter.Type).TypeArguments[0].ToFullyQualified());