Make query string parameter parsers injectable and extendable

Author: bkoelman

benchmarks/QueryString/QueryStringParserBenchmarks.cs

@@ -4,6 +4,7 @@
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.Queries.Parsing;
 using JsonApiDotNetCore.QueryStrings;
 using JsonApiDotNetCore.QueryStrings.Internal;
 using JsonApiDotNetCore.Resources;
@@ -37,11 +38,23 @@ public QueryStringParserBenchmarks()
 
         var resourceFactory = new ResourceFactory(new ServiceContainer());
 
-        var includeReader = new IncludeQueryStringParameterReader(request, resourceGraph, options);
-        var filterReader = new FilterQueryStringParameterReader(request, resourceGraph, resourceFactory, options, Enumerable.Empty<IFilterValueConverter>());
-        var sortReader = new SortQueryStringParameterReader(request, resourceGraph);
-        var sparseFieldSetReader = new SparseFieldSetQueryStringParameterReader(request, resourceGraph);
-        var paginationReader = new PaginationQueryStringParameterReader(request, resourceGraph, options);
+        var includeParser = new IncludeParser(options);
+        var includeReader = new IncludeQueryStringParameterReader(includeParser, request, resourceGraph);
+
+        var filterScopeParser = new QueryStringParameterScopeParser();
+        var filterValueParser = new FilterParser(resourceFactory, Enumerable.Empty<IFilterValueConverter>());
+        var filterReader = new FilterQueryStringParameterReader(filterScopeParser, filterValueParser, request, resourceGraph, options);
+
+        var sortScopeParser = new QueryStringParameterScopeParser();
+        var sortValueParser = new SortParser();
+        var sortReader = new SortQueryStringParameterReader(sortScopeParser, sortValueParser, request, resourceGraph);
+
+        var sparseFieldSetScopeParser = new SparseFieldTypeParser(resourceGraph);
+        var sparseFieldSetValueParser = new SparseFieldSetParser();
+        var sparseFieldSetReader = new SparseFieldSetQueryStringParameterReader(sparseFieldSetScopeParser, sparseFieldSetValueParser, request, resourceGraph);
+
+        var paginationParser = new PaginationParser();
+        var paginationReader = new PaginationQueryStringParameterReader(paginationParser, request, resourceGraph, options);
 
         IQueryStringParameterReader[] readers = ArrayFactory.Create<IQueryStringParameterReader>(includeReader, filterReader, sortReader,
             sparseFieldSetReader, paginationReader);

src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs

@@ -3,6 +3,7 @@
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.Internal;
+using JsonApiDotNetCore.Queries.Parsing;
 using JsonApiDotNetCore.QueryStrings;
 using JsonApiDotNetCore.QueryStrings.Internal;
 using JsonApiDotNetCore.Repositories;
@@ -210,6 +211,14 @@ private void RegisterImplementationForInterfaces(HashSet<Type> unboundInterfaces
 
     private void AddQueryStringLayer()
     {
+        _services.TryAddTransient<IQueryStringParameterScopeParser, QueryStringParameterScopeParser>();
+        _services.TryAddTransient<IIncludeParser, IncludeParser>();
+        _services.TryAddTransient<IFilterParser, FilterParser>();
+        _services.TryAddTransient<ISortParser, SortParser>();
+        _services.TryAddTransient<ISparseFieldTypeParser, SparseFieldTypeParser>();
+        _services.TryAddTransient<ISparseFieldSetParser, SparseFieldSetParser>();
+        _services.TryAddTransient<IPaginationParser, PaginationParser>();
+
         _services.AddScoped<IIncludeQueryStringParameterReader, IncludeQueryStringParameterReader>();
         _services.AddScoped<IFilterQueryStringParameterReader, FilterQueryStringParameterReader>();
         _services.AddScoped<ISortQueryStringParameterReader, SortQueryStringParameterReader>();

src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Text;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.Queries.Internal.Parsing;
+using JsonApiDotNetCore.Queries.Parsing;
 
 namespace JsonApiDotNetCore.Queries.Expressions;
 

src/JsonApiDotNetCore/Queries/Expressions/CountExpression.cs

@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using JsonApiDotNetCore.Queries.Internal.Parsing;
+using JsonApiDotNetCore.Queries.Parsing;
 
 namespace JsonApiDotNetCore.Queries.Expressions;
 

src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs

@@ -1,6 +1,6 @@
 using System.Text;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.Queries.Internal.Parsing;
+using JsonApiDotNetCore.Queries.Parsing;
 
 namespace JsonApiDotNetCore.Queries.Expressions;
 

src/JsonApiDotNetCore/Queries/Expressions/IsTypeExpression.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Queries.Internal.Parsing;
+using JsonApiDotNetCore.Queries.Parsing;
 
 namespace JsonApiDotNetCore.Queries.Expressions;
 

src/JsonApiDotNetCore/Queries/Expressions/NotExpression.cs

@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using JsonApiDotNetCore.Queries.Internal.Parsing;
+using JsonApiDotNetCore.Queries.Parsing;
 
 namespace JsonApiDotNetCore.Queries.Expressions;
 

src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs

@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using JsonApiDotNetCore.Queries.Internal.Parsing;
+using JsonApiDotNetCore.Queries.Parsing;
 
 namespace JsonApiDotNetCore.Queries.Expressions;