feat: 添加 foreach 遍历支持

Author: stratosblue

README.md

@@ -62,9 +62,9 @@ string s1 = json.s;
 MyClass obj = json.a.b; //将 json.a.b 反序列化到类型 MyClass
 
 //获取内部的原始 System.Text.Json.Nodes.* 对象
-JsonArray array = json.ArrayProperty;
-JsonObject obj = json.ObjectProperty;
-JsonNode node = json.NodeProperty;
+JsonArray array = json.XXArrayProperty; //显式类型转换
+JsonObject obj = json.XXXObjectProperty;  //显式类型转换
+JsonNode node = json.XXXXNodeProperty;  //显式类型转换
 ```
 
 ## 修改 `JSON` 对象
@@ -103,14 +103,37 @@ var b4 = JSON.isUndefined(() => json.a.b.c.e.f.g.h.i.j.k);
 
 ```C#
 //遍历Array
+
+//foreach遍历
+foreach (var item in json.XXArrayProperty)
+{
+}
+
 //显式赋值类型
 IEnumerable<dynamic> enumerable = json.Array;
+
 //通过IDynamicEnumerable
 var enumerable = ((IDynamicEnumerable)json.Array).AsEnumerable();
 
 //遍历属性
+
+//foreach遍历
+foreach (var item in json.XXArrayProperty)
+{
+    //item.Key
+    //item.Value
+}
+
+//类型化的foreach遍历
+foreach (JsonKeyValuePair item in json.XXArrayProperty)
+{
+    //item.Key
+    //item.Value
+}
+
 //显式赋值类型
 IEnumerable<KeyValuePair<string, dynamic?>> enumerable = json;
+
 //通过IDynamicKeyValueEnumerable
 var enumerable = ((IDynamicKeyValueEnumerable)json).AsEnumerable();
 ```

src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.csproj

@@ -39,7 +39,7 @@
 
     <Authors>Stratos</Authors>
 
-    <Version>1.1.3</Version>
+    <Version>1.1.4</Version>
 
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/cuture/Cuture.Extensions.SystemTextJson.Dynamic</PackageProjectUrl>

src/Cuture.Extensions.SystemTextJson.Dynamic/JsonDynamicAccessor.cs

@@ -1,4 +1,5 @@
-using System.Dynamic;
+using System.Collections;
+using System.Dynamic;
 using System.Text.Json.Nodes;
 
 namespace System.Text.Json.Dynamic;
@@ -51,6 +52,17 @@ public override bool TryConvert(ConvertBinder binder, out object? result)
             {
                 result = Node;
             }
+            else if (binder.ReturnType == typeof(IEnumerable))
+            {
+                if (this is IDynamicEnumerable dynamicEnumerable)
+                {
+                    result = dynamicEnumerable.AsEnumerable();
+                }
+                else if (this is IDynamicKeyValueEnumerable localDynamicKeyValueEnumerable)
+                {
+                    result = localDynamicKeyValueEnumerable.AsEnumerable();
+                }
+            }
             else
             {
                 result = Node.Deserialize(binder.ReturnType, JSON.s_defaultJsonSerializerOptions);

src/Cuture.Extensions.SystemTextJson.Dynamic/JsonKeyValue.cs

@@ -0,0 +1,43 @@
+#pragma warning disable IDE0079
+#pragma warning disable IDE0130
+#pragma warning disable IDE0161
+
+#if NETSTANDARD2_0
+
+namespace System.Runtime.CompilerServices
+{
+    internal class IsExternalInit
+    {
+    }
+}
+
+#endif
+
+namespace System.Text.Json.Dynamic
+{
+    /// <summary>
+    /// Json字段的Key - Value结构
+    /// </summary>
+    /// <param name="Key">key</param>
+    /// <param name="Value">值</param>
+    public readonly record struct JsonKeyValuePair(string Key, dynamic? Value)
+    {
+        /// <summary>
+        /// 隐式转换
+        /// </summary>
+        /// <param name="value"></param>
+        public static implicit operator JsonKeyValuePair(KeyValuePair<string, dynamic?> value)
+        {
+            return new(value.Key, value.Value);
+        }
+
+        /// <summary>
+        /// 隐式转换
+        /// </summary>
+        /// <param name="value"></param>
+        public static implicit operator KeyValuePair<string, object?>(JsonKeyValuePair value)
+        {
+            return new(value.Key, value.Value as object);
+        }
+    }
+}

test/Cuture.Extensions.SystemTextJson.Dynamic.Test/DynamicEnumerableTest.cs

@@ -5,6 +5,31 @@ public class DynamicEnumerableTest
 {
     #region Public 方法
 
+    [TestMethod]
+    public void Should_Array_EqualOrigin()
+    {
+        DynamicJSONTestClass.GetTestValue(out var origin, out var json);
+
+        var index = 0;
+        foreach (var item in json.MyProperty6)
+        {
+            Check(origin.MyProperty6[index++], item);
+        }
+
+        index = 0;
+
+        foreach (dynamic item in json.MyProperty7)
+        {
+            Check(origin.MyProperty7[index++], item);
+        }
+
+        static void Check(object originValue, dynamic value)
+        {
+            //直接比较有点麻烦。。直接转json字符串比较
+            Assert.AreEqual(JsonSerializer.Serialize(originValue), JSON.stringify(value));
+        }
+    }
+
     [TestMethod]
     public void ShouldCastFail()
     {
@@ -90,7 +115,7 @@ public void ShouldEqualLinqOnOrigin()
         var filtered = origin.MyProperty6.Where(m => m[0] > '1').ToArray();
         var dynamicFiltered = enumerable.Where(m => m[0] > '1').ToArray();
 
-        Assert.AreEqual(filtered.Length, dynamicFiltered.Length);
+        Assert.HasCount(filtered.Length, dynamicFiltered);
 
         for (int i = 0; i < filtered.Length; i++)
         {
@@ -107,7 +132,7 @@ public void ShouldEqualOrigin()
 
         var dynamicToArray = enumerable.ToArray();
 
-        Assert.AreEqual(origin.MyProperty6.Length, dynamicToArray.Length);
+        Assert.HasCount(origin.MyProperty6.Length, dynamicToArray);
 
         for (int i = 0; i < origin.MyProperty6.Length; i++)
         {
@@ -130,6 +155,18 @@ public void ShouldEqualOriginProperty()
             }
         }
 
+        //foreach
+        foreach (var item in json)
+        {
+            Check(origin, item.Key, item.Value);
+        }
+
+        //typed foreach
+        foreach (JsonKeyValuePair item in json)
+        {
+            Check(origin, item.Key, item.Value);
+        }
+
         //IEnumerable<dynamic>
         {
             IEnumerable<dynamic> dynamicEnumerable = json;