feat: 添加JSON.isArray方法，用于检查对象是否为数组;

fix: 修正IDynamicKeyValueEnumerable不能正确修改原始对象的问题

Author: stratosblue

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

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

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

@@ -102,6 +102,13 @@ static JSON()
         return new JsonObjectDynamicAccessor(jsonNode);
     }
 
+    /// <summary>
+    /// 判断<paramref name="value"/>是否为数组
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool isArray(object? value) => value is Array || value is JsonArrayDynamicAccessor || value is JsonArray;
+
     /// <inheritdoc cref="Undefined.IsUndefined(in object?)"/>
     public static bool isUndefined(object? value) => System.Text.Json.Dynamic.Undefined.IsUndefined(value);
 

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

@@ -78,7 +78,7 @@ public override bool TrySetMember(SetMemberBinder binder, object? value)
     {
         foreach (var item in _jsonObject)
         {
-            yield return new(item.Key, JSON.create(item.Value));
+            yield return new(item.Key, JSON.dynamic(item.Value));
         }
     }
 

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

@@ -157,5 +157,60 @@ static void Check(object origin, string key, dynamic value)
         }
     }
 
+    [TestMethod]
+    public void ShouldModifyPropertySuccess()
+    {
+        DynamicJSONTestClass.GetTestValue(out var origin, out var json);
+        DynamicJSONTestClass.GetTestValue(out var origin2, out var json2);
+
+        //IDynamicEnumerable
+        {
+            var originEnumerable = ((IDynamicKeyValueEnumerable)json2.MyProperty8).AsEnumerable();
+
+            foreach (var item in ((IDynamicKeyValueEnumerable)json.MyProperty8).AsEnumerable())
+            {
+                item.Value.Value1 = item.Value.Value1 + 1;
+            }
+
+            foreach (var item in ((IDynamicKeyValueEnumerable)json.MyProperty8).AsEnumerable())
+            {
+                Check(origin2.MyProperty8, item.Key, item.Value);
+            }
+        }
+
+        //IDynamicEnumerable
+        {
+            var originEnumerable = ((IDynamicEnumerable)json2.MyProperty7).AsEnumerable();
+
+            foreach (var item in ((IDynamicEnumerable)json.MyProperty7).AsEnumerable())
+            {
+                item.Value1 = item.Value1 + 1;
+            }
+
+            int index = 0;
+            foreach (var item in ((IDynamicEnumerable)json.MyProperty7).AsEnumerable())
+            {
+                AreNotEqual(originEnumerable.Skip(index++).First(), item);
+            }
+        }
+
+        static void Check(object origin, string key, dynamic value)
+        {
+            var type = origin.GetType();
+            var originProperty = type.GetProperty(key);
+            Assert.IsNotNull(originProperty);
+
+            var originValue = originProperty.GetValue(origin);
+
+            AreNotEqual(originValue, value);
+        }
+
+        static void AreNotEqual(object originValue, dynamic value)
+        {
+            //直接比较有点麻烦。。直接转json字符串比较
+            Assert.AreNotEqual(JsonSerializer.Serialize(originValue), JSON.stringify(value));
+        }
+    }
+
     #endregion Public 方法
 }

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

@@ -21,7 +21,11 @@ internal class DynamicJSONTestClass
         }
     };
 
-    public string[] MyProperty6 { get; set; } = new[] { "1", "2", "3", "4", "5" };
+    public string[] MyProperty6 { get; set; } = ["1", "2", "3", "4", "5"];
+
+    public NestedClass[] MyProperty7 { get; set; } = [new() { Value1 = 1, Value2 = "1" }, new() { Value1 = 2, Value2 = "2" }, new() { Value1 = 3, Value2 = "3" }];
+
+    public NestedClassCollection MyProperty8 { get; set; } = new();
 
     public int? NullableProperty { get; set; } = null;
 
@@ -55,7 +59,43 @@ public void Check(dynamic json)
                 Assert.AreEqual(MyProperty6[i], json.MyProperty6[i]);
             }
         }
+
+        if (MyProperty6?.Length > 0)
+        {
+            for (int i = 0; i < MyProperty6.Length; i++)
+            {
+                Assert.AreEqual(MyProperty6[i], json.MyProperty6[i]);
+            }
+        }
     }
 
     #endregion Public 方法
+
+    #region Public 类
+
+    public class NestedClass
+    {
+        #region Public 属性
+
+        public int Value1 { get; set; }
+
+        public string Value2 { get; set; }
+
+        #endregion Public 属性
+    }
+
+    public class NestedClassCollection
+    {
+        #region Public 属性
+
+        public NestedClass Property1 { get; set; } = new() { Value1 = 1, Value2 = "1" };
+
+        public NestedClass Property2 { get; set; } = new() { Value1 = 2, Value2 = "3" };
+
+        public NestedClass Property3 { get; set; } = new() { Value1 = 2, Value2 = "3" };
+
+        #endregion Public 属性
+    }
+
+    #endregion Public 类
 }

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

@@ -0,0 +1,26 @@
+namespace System.Text.Json.Dynamic;
+
+[TestClass]
+public class JSONisArrayTest
+{
+    #region Public 方法
+
+    [TestMethod]
+    public void Should_Check_Success()
+    {
+        DynamicJSONTestClass.GetTestValue(out var origin, out var json);
+
+        Assert.IsFalse(JSON.isArray(json.MyProperty1));
+        Assert.IsFalse(JSON.isArray(json.MyProperty2));
+        Assert.IsFalse(JSON.isArray(json.MyProperty3));
+        Assert.IsFalse(JSON.isArray(json.MyProperty4));
+        Assert.IsFalse(JSON.isArray(json.MyProperty5));
+
+        Assert.IsTrue(JSON.isArray(json.MyProperty6));
+        Assert.IsTrue(JSON.isArray(origin.MyProperty6));
+        Assert.IsTrue(JSON.isArray(json.MyProperty7));
+        Assert.IsTrue(JSON.isArray(origin.MyProperty7));
+    }
+
+    #endregion Public 方法
+}