Code style improvements. Small performance improvements on QueryStringExtensions.

Author: Seramis

src/ByteAether.QueryLink.Test/GlobalSuppressions.cs

@@ -0,0 +1,9 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments", Justification = "Unittests")]
+[assembly: SuppressMessage("Performance", "CA1866:Use char overload", Justification = "Unittests")]

src/ByteAether.QueryLink.Test/StringValueParserTests.cs

@@ -72,7 +72,7 @@ public void Parse_EmptyArray_ShouldReturnArray()
 	{
 		var result = StringValueParser.Parse("[]");
 		Assert.IsType<object[]>(result);
-		Assert.Equal(new object[] { }, result);
+		Assert.Equal(Array.Empty<object>(), result);
 	}
 
 	[Fact]

src/ByteAether.QueryLink/IsExternalInit.cs

@@ -1,6 +1,8 @@
 using System.ComponentModel;
 
+#pragma warning disable IDE0130 // Namespace does not match folder structure
 namespace System.Runtime.CompilerServices;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Bug workaround for .net standard

src/ByteAether.QueryLink/QueryStringExtensions.cs

@@ -13,22 +13,24 @@ namespace ByteAether.QueryLink;
 /// </summary>
 public static class QueryStringExtensions
 {
-	private static readonly (FilterOperator Operator, string StringValue)[] _filterOperatorPairs
+	private static readonly Dictionary<FilterOperator, string> _operatorToStringMap
 		= ((FilterOperator[])Enum.GetValues(typeof(FilterOperator)))
-		.Select(x => (
-			Operator: x,
-			StringValue: typeof(FilterOperator)
-				.GetField(x.ToString())?
-				.GetCustomAttribute<DescriptionAttribute>()?
-				.Description ?? x.ToString()
-		))
-		.ToArray();
+			.ToDictionary(
+				x => x,
+				x => typeof(FilterOperator)
+					.GetField(x.ToString())?
+					.GetCustomAttribute<DescriptionAttribute>()?
+					.Description ?? x.ToString()
+			);
+
+	private static readonly Dictionary<string, FilterOperator> _operatorFromStringMap
+		= _operatorToStringMap.ToDictionary(x => x.Value, x => x.Key);
 
 	private static readonly Regex _filterSplitter = new(
 		$"({string.Join(
 			'|',
-			_filterOperatorPairs
-				.Select(x => x.StringValue)
+			_operatorToStringMap
+				.Values
 				.OrderByDescending(x => x.Length)
 				.Select(Regex.Escape)
 		)})",
@@ -49,8 +51,8 @@ public static string ToQueryString(
 	) => new StringBuilder()
 		.Append(
 			string.Join('&', definitions.Filters
-			.Select(ToQueryString)
-			.Select(x => $"{filterKey}[]={x}")
+				.Select(ToQueryString)
+				.Select(x => $"{filterKey}[]={x}")
 			)
 		)
 		.Append(definitions.Orders.Any() ? $"&{orderKey}=" : string.Empty)
@@ -86,12 +88,12 @@ public static Definitions FromQueryString(
 			if (queryParam.Key == $"{filterKey}[]")
 			{
 				var valParts = _filterSplitter.Split(queryParam.Value, 2);
-				var op = OperatorFromString(valParts[1]);
+				var op = _operatorFromStringMap[valParts[1]];
 				var filterValue = StringValueParser.Parse(valParts[2]);
 
 				filters.Add(new FilterDefinition<object?>(
 					valParts[0],
-					OperatorFromString(valParts[1]),
+					_operatorFromStringMap[valParts[1]],
 					filterValue
 				));
 			}
@@ -127,12 +129,6 @@ private static string ToQueryString<T>(FilterDefinition<T> def)
 				? "[" + string.Join(',', (def.Value as IEnumerable)!.OfType<object>().Select(x => x.ToString()?.Replace(",", "\\,"))) + "]"
 				: def.Value?.ToString();
 
-		return HttpUtility.UrlEncode($"{def.Name}{OperatorToString(def.Operation)}{valueSet}");
+		return HttpUtility.UrlEncode($"{def.Name}{_operatorToStringMap[def.Operation]}{valueSet}");
 	}
-
-	private static string OperatorToString(FilterOperator op)
-		=> _filterOperatorPairs.Single(x => x.Operator == op).StringValue;
-
-	private static FilterOperator OperatorFromString(string operatorString)
-		=> _filterOperatorPairs.Single(x => x.StringValue == operatorString).Operator;
 }

src/ByteAether.QueryLink/QueryableExtensions.cs

@@ -133,7 +133,7 @@ IEnumerable<Overrides<T>.Override<object, object>> overrides
 			if (or != null)
 			{
 				expBody = GetTrueExpression(or.ValueReplace.Body);
-				expParams = or.ValueReplace.Parameters.ToArray();
+				expParams = [.. or.ValueReplace.Parameters];
 			}
 
 			var conditionExpression = GetFilterExpression(expBody, Expression.Constant(def.Value), def.Operation);
@@ -179,7 +179,7 @@ IEnumerable<Overrides<T>.Override<object, object>> overrides
 			if (or != null)
 			{
 				expBody = GetTrueExpression(or.ValueReplace.Body);
-				expParams = or.ValueReplace.Parameters.ToArray();
+				expParams = [.. or.ValueReplace.Parameters];
 			}
 
 			var selector = Expression.Lambda(expBody, expParams);

src/ByteAether.QueryLink/StringValueParser.cs

@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 
 namespace ByteAether.QueryLink;
+
 internal static partial class StringValueParser
 {
 	private static readonly List<Func<string, object?>> _parsers = [