Merge branch 'master' into request-meta-tests-boilerplate

Author: mrmarcosmagalhaes

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2025.3.0.3",
+      "version": "2025.3.1",
       "commands": [
         "jb"
       ],
@@ -17,7 +17,7 @@
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.5.0",
+      "version": "5.5.1",
       "commands": [
         "reportgenerator"
       ],

JsonApiDotNetCore.sln.DotSettings

@@ -97,7 +97,7 @@
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/ReplaceWithPrimaryConstructorParameter/PreserveReadonlyModifier/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertEmptyCollection/@EntryValue">SUGGESTION</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertForInterfaceTargetTypes/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=JADNC_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="JADNC Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSReformatInactiveBranches&gt;True&lt;/CSReformatInactiveBranches&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=JADNC_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="JADNC Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSReformatInactiveBranches&gt;True&lt;/CSReformatInactiveBranches&gt;&lt;CSharpReformatComments&gt;True&lt;/CSharpReformatComments&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">JADNC Full Cleanup</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>

package-versions.props

@@ -5,7 +5,7 @@
     <DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
     <HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
     <NewtonsoftJsonFrozenVersion>13.0.4</NewtonsoftJsonFrozenVersion>
-    <SwashbuckleFrozenVersion>10.0.1</SwashbuckleFrozenVersion>
+    <SwashbuckleFrozenVersion>10.1.0</SwashbuckleFrozenVersion>
     <SystemTextRegularExpressionsFrozenVersion>4.3.1</SystemTextRegularExpressionsFrozenVersion>
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
@@ -24,10 +24,10 @@
     <MiniValidationVersion>0.9.*</MiniValidationVersion>
     <NSwagApiClientVersion>14.6.*</NSwagApiClientVersion>
     <NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
-    <PolyfillVersion>9.3.*</PolyfillVersion>
+    <PolyfillVersion>9.4.*</PolyfillVersion>
     <ReadableExpressionsVersion>4.1.*</ReadableExpressionsVersion>
     <ScalarAspNetCoreVersion>2.11.*</ScalarAspNetCoreVersion>
-    <SwashbuckleVersion>[10.0.*-*,10.0.2)</SwashbuckleVersion>
+    <SwashbuckleVersion>10.*-*</SwashbuckleVersion>
     <SystemTextJsonVersion>10.0.*</SystemTextJsonVersion>
     <TestSdkVersion>18.0.*</TestSdkVersion>
     <XunitVersion>2.9.*</XunitVersion>

src/Examples/DapperExample/TranslationToSql/Builders/SelectStatementBuilder.cs

@@ -678,13 +678,13 @@ private CountNode GetCountClause(CountExpression expression, TableAccessorNode o
 
     public override SqlTreeNode VisitMatchText(MatchTextExpression expression, TableAccessorNode tableAccessor)
     {
-        var column = (ColumnNode)Visit(expression.TargetAttribute, tableAccessor);
+        var column = (ColumnNode)Visit(expression.MatchTarget, tableAccessor);
         return new LikeNode(column, expression.MatchKind, (string)expression.TextValue.TypedValue);
     }
 
     public override SqlTreeNode VisitAny(AnyExpression expression, TableAccessorNode tableAccessor)
     {
-        var column = (ColumnNode)Visit(expression.TargetAttribute, tableAccessor);
+        var column = (ColumnNode)Visit(expression.MatchTarget, tableAccessor);
 
         ReadOnlyCollection<ParameterNode> parameters =
             VisitSequence<LiteralConstantExpression, ParameterNode>(expression.Constants.OrderBy(constant => constant.TypedValue), tableAccessor);

src/JsonApiDotNetCore.Annotations/TypeExtensions.cs

@@ -7,7 +7,7 @@ internal static class TypeExtensions
     /// </summary>
     public static bool IsOrImplementsInterface<TInterface>(this Type? source)
     {
-        return IsOrImplementsInterface(source, typeof(TInterface));
+        return source.IsOrImplementsInterface(typeof(TInterface));
     }
 
     /// <summary>

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaRepositoryExtensions.cs

@@ -1,34 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class SchemaRepositoryExtensions
 {
-    private const string ReservedIdsFieldName = "_reservedIds";
-    private static readonly FieldInfo ReservedIdsField = GetReservedIdsField();
-
-    private static FieldInfo GetReservedIdsField()
-    {
-        FieldInfo? field = typeof(SchemaRepository).GetField(ReservedIdsFieldName, BindingFlags.Instance | BindingFlags.NonPublic);
-
-        if (field == null)
-        {
-            throw new InvalidOperationException($"Failed to locate private field '{ReservedIdsFieldName}' " +
-                $"in type '{typeof(SchemaRepository).FullName}' in assembly '{typeof(SchemaRepository).Assembly.FullName}'.");
-        }
-
-        if (field.FieldType != typeof(Dictionary<Type, string>))
-        {
-            throw new InvalidOperationException($"Unexpected type '{field.FieldType}' of private field '{ReservedIdsFieldName}' " +
-                $"in type '{typeof(SchemaRepository).FullName}' in assembly '{typeof(SchemaRepository).Assembly.FullName}'.");
-        }
-
-        return field;
-    }
-
     public static OpenApiSchemaReference LookupByType(this SchemaRepository schemaRepository, Type schemaType)
     {
         ArgumentNullException.ThrowIfNull(schemaRepository);
@@ -48,24 +25,4 @@ public static bool TryLookupByTypeSafe(this SchemaRepository schemaRepository, T
         referenceSchema = result ? obliviousReferenceSchema : null;
         return result;
     }
-
-    public static void ReplaceSchemaId(this SchemaRepository schemaRepository, Type oldSchemaType, string newSchemaId)
-    {
-        ArgumentNullException.ThrowIfNull(schemaRepository);
-        ArgumentNullException.ThrowIfNull(oldSchemaType);
-        ArgumentException.ThrowIfNullOrEmpty(newSchemaId);
-
-        if (schemaRepository.TryLookupByTypeSafe(oldSchemaType, out OpenApiSchemaReference? referenceSchema))
-        {
-            string oldSchemaId = referenceSchema.GetReferenceId();
-
-            IOpenApiSchema targetSchema = schemaRepository.Schemas[oldSchemaId];
-
-            schemaRepository.Schemas.Remove(oldSchemaId);
-            schemaRepository.Schemas.Add(newSchemaId, targetSchema);
-
-            var reservedIds = (Dictionary<Type, string>)ReservedIdsField.GetValue(schemaRepository)!;
-            reservedIds.Remove(oldSchemaType);
-        }
-    }
 }

src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs

@@ -21,7 +21,7 @@ public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection
         Action<ServiceDiscoveryFacade>? discovery = null, Action<ResourceGraphBuilder>? resources = null, IMvcCoreBuilder? mvcBuilder = null)
         where TDbContext : DbContext
     {
-        return AddJsonApi(services, options, discovery, resources, mvcBuilder, [typeof(TDbContext)]);
+        return services.AddJsonApi(options, discovery, resources, mvcBuilder, [typeof(TDbContext)]);
     }
 
     /// <summary>

src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs

@@ -17,21 +17,21 @@ namespace JsonApiDotNetCore.Queries.Expressions;
 public class AnyExpression : FilterExpression
 {
     /// <summary>
-    /// The attribute whose value to compare. Chain format: an optional list of to-one relationships, followed by an attribute.
+    /// The function or attribute whose value to compare. Attribute chain format: an optional list of to-one relationships, followed by an attribute.
     /// </summary>
-    public ResourceFieldChainExpression TargetAttribute { get; }
+    public QueryExpression MatchTarget { get; }
 
     /// <summary>
     /// One or more constants to compare the attribute's value against.
     /// </summary>
     public IImmutableSet<LiteralConstantExpression> Constants { get; }
 
-    public AnyExpression(ResourceFieldChainExpression targetAttribute, IImmutableSet<LiteralConstantExpression> constants)
+    public AnyExpression(QueryExpression matchTarget, IImmutableSet<LiteralConstantExpression> constants)
     {
-        ArgumentNullException.ThrowIfNull(targetAttribute);
+        ArgumentNullException.ThrowIfNull(matchTarget);
         ArgumentGuard.NotNullNorEmpty(constants);
 
-        TargetAttribute = targetAttribute;
+        MatchTarget = matchTarget;
         Constants = constants;
     }
 
@@ -56,7 +56,7 @@ private string InnerToString(bool toFullString)
 
         builder.Append(Keywords.Any);
         builder.Append('(');
-        builder.Append(toFullString ? TargetAttribute.ToFullString() : TargetAttribute.ToString());
+        builder.Append(toFullString ? MatchTarget.ToFullString() : MatchTarget.ToString());
         builder.Append(',');
         builder.Append(string.Join(',', Constants.Select(constant => toFullString ? constant.ToFullString() : constant.ToString()).Order()));
         builder.Append(')');
@@ -78,13 +78,13 @@ public override bool Equals(object? obj)
 
         var other = (AnyExpression)obj;
 
-        return TargetAttribute.Equals(other.TargetAttribute) && Constants.SetEquals(other.Constants);
+        return MatchTarget.Equals(other.MatchTarget) && Constants.SetEquals(other.Constants);
     }
 
     public override int GetHashCode()
     {
         var hashCode = new HashCode();
-        hashCode.Add(TargetAttribute);
+        hashCode.Add(MatchTarget);
 
         foreach (LiteralConstantExpression constant in Constants)
         {

src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs

@@ -24,12 +24,12 @@ namespace JsonApiDotNetCore.Queries.Expressions;
 public class MatchTextExpression : FilterExpression
 {
     /// <summary>
-    /// The attribute whose value to match. Chain format: an optional list of to-one relationships, followed by an attribute.
+    /// The function or attribute whose value to match. Attribute chain format: an optional list of to-one relationships, followed by an attribute.
     /// </summary>
-    public ResourceFieldChainExpression TargetAttribute { get; }
+    public QueryExpression MatchTarget { get; }
 
     /// <summary>
-    /// The text to match the attribute's value against.
+    /// The text to match against.
     /// </summary>
     public LiteralConstantExpression TextValue { get; }
 
@@ -38,12 +38,12 @@ public class MatchTextExpression : FilterExpression
     /// </summary>
     public TextMatchKind MatchKind { get; }
 
-    public MatchTextExpression(ResourceFieldChainExpression targetAttribute, LiteralConstantExpression textValue, TextMatchKind matchKind)
+    public MatchTextExpression(QueryExpression matchTarget, LiteralConstantExpression textValue, TextMatchKind matchKind)
     {
-        ArgumentNullException.ThrowIfNull(targetAttribute);
+        ArgumentNullException.ThrowIfNull(matchTarget);
         ArgumentNullException.ThrowIfNull(textValue);
 
-        TargetAttribute = targetAttribute;
+        MatchTarget = matchTarget;
         TextValue = textValue;
         MatchKind = matchKind;
     }
@@ -71,8 +71,8 @@ private string InnerToString(bool toFullString)
         builder.Append('(');
 
         builder.Append(toFullString
-            ? string.Join(',', TargetAttribute.ToFullString(), TextValue.ToFullString())
-            : string.Join(',', TargetAttribute.ToString(), TextValue.ToString()));
+            ? string.Join(',', MatchTarget.ToFullString(), TextValue.ToFullString())
+            : string.Join(',', MatchTarget.ToString(), TextValue.ToString()));
 
         builder.Append(')');
 
@@ -93,11 +93,11 @@ public override bool Equals(object? obj)
 
         var other = (MatchTextExpression)obj;
 
-        return TargetAttribute.Equals(other.TargetAttribute) && TextValue.Equals(other.TextValue) && MatchKind == other.MatchKind;
+        return MatchTarget.Equals(other.MatchTarget) && TextValue.Equals(other.TextValue) && MatchKind == other.MatchKind;
     }
 
     public override int GetHashCode()
     {
-        return HashCode.Combine(TargetAttribute, TextValue, MatchKind);
+        return HashCode.Combine(MatchTarget, TextValue, MatchKind);
     }
 }

src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs

@@ -149,12 +149,12 @@ public override QueryExpression VisitPagination(PaginationExpression expression,
 
     public override QueryExpression? VisitMatchText(MatchTextExpression expression, TArgument argument)
     {
-        var newTargetAttribute = Visit(expression.TargetAttribute, argument) as ResourceFieldChainExpression;
+        var newMatchTarget = Visit(expression.MatchTarget, argument) as ResourceFieldChainExpression;
         var newTextValue = Visit(expression.TextValue, argument) as LiteralConstantExpression;
 
-        if (newTargetAttribute != null && newTextValue != null)
+        if (newMatchTarget != null && newTextValue != null)
         {
-            var newExpression = new MatchTextExpression(newTargetAttribute, newTextValue, expression.MatchKind);
+            var newExpression = new MatchTextExpression(newMatchTarget, newTextValue, expression.MatchKind);
             return newExpression.Equals(expression) ? expression : newExpression;
         }
 
@@ -163,12 +163,12 @@ public override QueryExpression VisitPagination(PaginationExpression expression,
 
     public override QueryExpression? VisitAny(AnyExpression expression, TArgument argument)
     {
-        var newTargetAttribute = Visit(expression.TargetAttribute, argument) as ResourceFieldChainExpression;
+        var newMatchTarget = Visit(expression.MatchTarget, argument) as ResourceFieldChainExpression;
         IImmutableSet<LiteralConstantExpression> newConstants = VisitSet(expression.Constants, argument);
 
-        if (newTargetAttribute != null)
+        if (newMatchTarget != null)
         {
-            var newExpression = new AnyExpression(newTargetAttribute, newConstants);
+            var newExpression = new AnyExpression(newMatchTarget, newConstants);
             return newExpression.Equals(expression) ? expression : newExpression;
         }