Merge branch 'master' into stef-NET10

Author: StefH

CHANGELOG.md

@@ -1,3 +1,21 @@
+# v1.6.8 (28 September 2025)
+- [#946](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/946) - Fix GroupByMany using composite key and normal key [bug] contributed by [StefH](https://github.com/StefH)
+- [#948](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/948) - Add IndexerName attribute to DynamicClass to fix naming issues with Item [bug] contributed by [StefH](https://github.com/StefH)
+- [#936](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/936) - AmbiguousMatchException when selecting a property named “Item” using EF Core DbContext [bug]
+- [#945](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/945) - ParseException when using composite key for grouping in GroupByMany [bug]
+
+# 1.6.7 (28 July 2025)
+- [#938](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/938) - Use TryConvertTypes also for strings [bug] contributed by [StefH](https://github.com/StefH)
+
+# v1.6.6 (11 June 2025)
+- [#929](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/929) - Add GroupBy method for Z.DynamicLinq.SystemTextJson and Z.DynamicLinq.NewtonsoftJson contributed by [StefH](https://github.com/StefH)
+- [#932](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/932) - Fix "in" for nullable Enums [bug] contributed by [StefH](https://github.com/StefH)
+- [#931](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/931) - Syntax IN dont work with nullable Enums [bug]
+
+# v1.6.5 (28 May 2025)
+- [#905](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/905) - Fix: Add Fallback in ExpressionPromoter to Handle Cache Cleanup in ConstantExpressionHelper [bug] contributed by [RenanCarlosPereira](https://github.com/RenanCarlosPereira)
+- [#904](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/904) - Race Condition in ConstantExpressionHelper Causing Parsing Failures [bug]
+
 # v1.6.4 (19 May 2025)
 - [#915](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/915) - Add support for "not in" and "not_in" [feature] contributed by [StefH](https://github.com/StefH)
 - [#923](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/923) - Fix MethodFinder TryFindAggregateMethod to support array [bug] contributed by [StefH](https://github.com/StefH)

Generate-ReleaseNotes.bat

@@ -1,5 +1,5 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=v1.6.4
+SET version=v1.6.8
 
 GitHubReleaseNotes --output CHANGELOG.md --exclude-labels known_issue out_of_scope not_planned invalid question documentation wontfix environment duplicate --language en --version %version% --token %GH_TOKEN%

README.md

@@ -1,18 +1,8 @@
-### Library Powered By
-
-This library is powered by [Entity Framework Extensions](https://entityframework-extensions.net/?z=github&y=system.linq.dynamic.core)
-
-<a href="https://entityframework-extensions.net/?z=github&y=system.linq.dynamic.core">
-<kbd>
-<img src="https://zzzprojects.github.io/images/logo/entityframework-extensions-pub.jpg" alt="Entity Framework Extensions" />
-</kbd>
-</a>
-
----
-
 # System.Linq.Dynamic.Core
 This is a **.NET Core / Standard port** of the Microsoft assembly for the .Net 4.0 Dynamic language functionality.
 
+---
+
 ## Overview
 With this library it's possible to write Dynamic LINQ queries (string based) on an `IQueryable`:
 ``` c#
@@ -32,6 +22,18 @@ db.Customers.WhereInterpolated($"City == {cityName} and Orders.Count >= {c}");
 
 ---
 
+## Sponsors
+
+ZZZ Projects owns and maintains **System.Linq.Dynamic.Core** as part of our [mission](https://zzzprojects.com/mission) to add value to the .NET community
+
+Through [Entity Framework Extensions](https://entityframework-extensions.net/?utm_source=zzzprojects&utm_medium=systemlinqdynamiccore) and [Dapper Plus](https://dapper-plus.net/?utm_source=zzzprojects&utm_medium=systemlinqdynamiccore), we actively sponsor and help key open-source libraries grow.
+
+[![Entity Framework Extensions](https://raw.githubusercontent.com/zzzprojects/System.Linq.Dynamic.Core/master/entity-framework-extensions-sponsor.png)](https://entityframework-extensions.net/bulk-insert?utm_source=zzzprojects&utm_medium=systemlinqdynamiccore)
+
+[![Dapper Plus](https://raw.githubusercontent.com/zzzprojects/System.Linq.Dynamic.Core/master/dapper-plus-sponsor.png)](https://dapper-plus.net/bulk-insert?utm_source=zzzprojects&utm_medium=systemlinqdynamiccore)
+
+---
+
 ## :exclamation: Breaking changes
 
 ### v1.3.0
@@ -82,7 +84,7 @@ Or provide a list of additional types in the [DefaultDynamicLinqCustomTypeProvid
 | &nbsp;&nbsp;**Issues** | [![GitHub issues](https://img.shields.io/github/issues/StefH/System.Linq.Dynamic.Core.svg)](https://github.com/StefH/System.Linq.Dynamic.Core/issues) |
 | | |
 | ***Quality*** | &nbsp; |
-| &nbsp;&nbsp;**CI Workflow** | ![CI Workflow](https://github.com/zzzprojects/System.Linq.Dynamic.Core/actions/workflows/ci.yml/badge.svg) |
+| &nbsp;&nbsp;**CI Workflow** | [![CI Workflow](https://github.com/zzzprojects/System.Linq.Dynamic.Core/actions/workflows/ci.yml/badge.svg)](https://github.com/zzzprojects/System.Linq.Dynamic.Core/actions/workflows/ci.yml) |
 | &nbsp;&nbsp;**SonarCloud** | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=zzzprojects_System.Linq.Dynamic.Core&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=zzzprojects_System.Linq.Dynamic.Core) |
 | |
 | ***NuGet*** | &nbsp; |

dapper-plus-sponsor.png

@@ -2,6 +2,7 @@
 using System.Linq.Dynamic.Core.NewtonsoftJson.Config;
 using System.Linq.Dynamic.Core.NewtonsoftJson.Extensions;
 using System.Linq.Dynamic.Core.Validation;
+using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
 
 namespace System.Linq.Dynamic.Core.NewtonsoftJson;
@@ -303,6 +304,42 @@ public static JToken First(this JArray source, string predicate, params object?[
     }
     #endregion FirstOrDefault
 
+    #region GroupBy
+    /// <summary>
+    /// Groups the elements of a sequence according to a specified key string function 
+    /// and creates a result value from each group and its key.
+    /// </summary>
+    /// <param name="source">A <see cref="JArray"/> whose elements to group.</param>
+    /// <param name="keySelector">A string expression to specify the key for each element.</param>
+    /// <param name="args">An object array that contains zero or more objects to insert into the predicate as parameters. Similar to the way String.Format formats strings.</param>
+    /// <returns>A <see cref="JArray"/> where each element represents a projection over a group and its key.</returns>
+    [PublicAPI]
+    public static JArray GroupBy(this JArray source, string keySelector, params object[]? args)
+    {
+        return GroupBy(source, NewtonsoftJsonParsingConfig.Default, keySelector, args);
+    }
+
+    /// <summary>
+    /// Groups the elements of a sequence according to a specified key string function 
+    /// and creates a result value from each group and its key.
+    /// </summary>
+    /// <param name="source">A <see cref="JArray"/> whose elements to group.</param>
+    /// <param name="config">The <see cref="NewtonsoftJsonParsingConfig"/>.</param>
+    /// <param name="keySelector">A string expression to specify the key for each element.</param>
+    /// <param name="args">An object array that contains zero or more objects to insert into the predicate as parameters. Similar to the way String.Format formats strings.</param>
+    /// <returns>A <see cref="JArray"/> where each element represents a projection over a group and its key.</returns>
+    [PublicAPI]
+    public static JArray GroupBy(this JArray source, NewtonsoftJsonParsingConfig config, string keySelector, params object[]? args)
+    {
+        Check.NotNull(source);
+        Check.NotNull(config);
+        Check.NotNullOrEmpty(keySelector);
+
+        var queryable = ToQueryable(source, config);
+        return ToJArray(() => queryable.GroupBy(config, keySelector, args));
+    }
+    #endregion
+
     #region Last
     /// <summary>
     /// Returns the last element of a sequence that satisfies a specified condition.
@@ -813,7 +850,17 @@ private static JArray ToJArray(Func<IQueryable> func)
         var array = new JArray();
         foreach (var dynamicElement in func())
         {
-            var element = dynamicElement is DynamicClass dynamicClass ? JObject.FromObject(dynamicClass) : dynamicElement;
+            var element = dynamicElement switch
+            {
+                IGrouping<object, object> grouping => new JObject
+                {
+                    [nameof(grouping.Key)] = JToken.FromObject(grouping.Key),
+                    ["Values"] = ToJArray(grouping.AsQueryable)
+                },
+                DynamicClass dynamicClass => JObject.FromObject(dynamicClass),
+                _ => dynamicElement
+            };
+
             array.Add(element);
         }
 

entity-framework-extensions-sponsor.png

@@ -5,6 +5,7 @@
 using System.Linq.Dynamic.Core.SystemTextJson.Utils;
 using System.Linq.Dynamic.Core.Validation;
 using System.Text.Json;
+using JetBrains.Annotations;
 
 namespace System.Linq.Dynamic.Core.SystemTextJson;
 
@@ -371,6 +372,42 @@ public static JsonElement First(this JsonDocument source, string predicate, para
     }
     #endregion FirstOrDefault
 
+    #region GroupBy
+    /// <summary>
+    /// Groups the elements of a sequence according to a specified key string function 
+    /// and creates a result value from each group and its key.
+    /// </summary>
+    /// <param name="source">A <see cref="JsonDocument"/> whose elements to group.</param>
+    /// <param name="keySelector">A string expression to specify the key for each element.</param>
+    /// <param name="args">An object array that contains zero or more objects to insert into the predicate as parameters. Similar to the way String.Format formats strings.</param>
+    /// <returns>A <see cref="JsonDocument"/> where each element represents a projection over a group and its key.</returns>
+    [PublicAPI]
+    public static JsonDocument GroupBy(this JsonDocument source, string keySelector, params object[]? args)
+    {
+        return GroupBy(source, SystemTextJsonParsingConfig.Default, keySelector, args);
+    }
+
+    /// <summary>
+    /// Groups the elements of a sequence according to a specified key string function 
+    /// and creates a result value from each group and its key.
+    /// </summary>
+    /// <param name="source">A <see cref="JsonDocument"/> whose elements to group.</param>
+    /// <param name="config">The <see cref="SystemTextJsonParsingConfig"/>.</param>
+    /// <param name="keySelector">A string expression to specify the key for each element.</param>
+    /// <param name="args">An object array that contains zero or more objects to insert into the predicate as parameters. Similar to the way String.Format formats strings.</param>
+    /// <returns>A <see cref="JsonDocument"/> where each element represents a projection over a group and its key.</returns>
+    [PublicAPI]
+    public static JsonDocument GroupBy(this JsonDocument source, SystemTextJsonParsingConfig config, string keySelector, params object[]? args)
+    {
+        Check.NotNull(source);
+        Check.NotNull(config);
+        Check.NotNullOrEmpty(keySelector);
+
+        var queryable = ToQueryable(source, config);
+        return ToJsonDocumentArray(() => queryable.GroupBy(config, keySelector, args));
+    }
+    #endregion
+
     #region Last
     /// <summary>
     /// Returns the last element of a sequence.
@@ -1037,7 +1074,17 @@ private static JsonDocument ToJsonDocumentArray(Func<IQueryable> func)
         var array = new List<object?>();
         foreach (var dynamicElement in func())
         {
-            array.Add(ToJsonElement(dynamicElement));
+            var element = dynamicElement switch
+            {
+                IGrouping<object, object> grouping => ToJsonElement(new
+                {
+                    Key = ToJsonElement(grouping.Key),
+                    Values = ToJsonDocumentArray(grouping.AsQueryable).RootElement
+                }),
+                _ => ToJsonElement(dynamicElement)
+            };
+
+            array.Add(element);
         }
 
         return JsonDocumentUtils.FromObject(array);

src/System.Linq.Dynamic.Core.NewtonsoftJson/NewtonsoftJsonExtensions.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace System.Linq.Dynamic.Core;
 
@@ -18,6 +19,8 @@ namespace System.Linq.Dynamic.Core;
 /// </summary>
 public abstract class DynamicClass : DynamicObject
 {
+    internal const string IndexerName = "System_Linq_Dynamic_Core_DynamicClass_Indexer";
+
     private Dictionary<string, object?>? _propertiesDictionary;
 
     private Dictionary<string, object?> Properties
@@ -99,11 +102,12 @@ public void SetDynamicPropertyValue(string propertyName, object value)
     /// <value>The <see cref="object"/>.</value>
     /// <param name="name">The name.</param>
     /// <returns>Value from the property.</returns>
+    [IndexerName(IndexerName)]
     public object? this[string name]
     {
         get
         {
-            return Properties.TryGetValue(name, out object? result) ? result : null;
+            return Properties.TryGetValue(name, out var result) ? result : null;
         }
 
         set
@@ -153,7 +157,7 @@ public override bool TryGetMember(GetMemberBinder binder, out object? result)
     /// </returns>
     public override bool TrySetMember(SetMemberBinder binder, object? value)
     {
-        string name = binder.Name;
+        var name = binder.Name;
         if (Properties.ContainsKey(name))
         {
             Properties[name] = value;

src/System.Linq.Dynamic.Core.SystemTextJson/SystemTextJsonExtensions.cs

@@ -6,6 +6,8 @@ namespace System.Linq.Dynamic.Core;
 /// </summary>
 public abstract class DynamicClass
 {
+    internal const string IndexerName = "System_Linq_Dynamic_Core_DynamicClass_Indexer";
+
     /// <summary>
     /// Gets the dynamic property by name.
     /// </summary>

src/System.Linq.Dynamic.Core/DynamicClass.cs

@@ -1,6 +1,7 @@
 #if UAP10_0
 using System.Collections.Generic;
 using System.Dynamic;
+using System.Runtime.CompilerServices;
 
 namespace System.Linq.Dynamic.Core;
 
@@ -9,6 +10,8 @@ namespace System.Linq.Dynamic.Core;
 /// </summary>
 public class DynamicClass : DynamicObject
 {
+    internal const string IndexerName = "System_Linq_Dynamic_Core_DynamicClass_Indexer";
+
     private readonly Dictionary<string, object> _properties = new();
 
     /// <summary>
@@ -31,6 +34,7 @@ public DynamicClass(params KeyValuePair<string, object>[] propertylist)
     /// </value>
     /// <param name="name">The name.</param>
     /// <returns>Value from the property.</returns>
+    [IndexerName(IndexerName)]
     public object this[string name]
     {
         get