feat: 为数组添加插入、删除等方法

Author: stratosblue

.editorconfig

@@ -7,11 +7,8 @@ end_of_line = crlf
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-dotnet_style_qualification_for_field = false:silent
-dotnet_style_qualification_for_property = false:silent
-dotnet_style_qualification_for_method = false:silent
-dotnet_style_qualification_for_event = false:silent
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+indent_size = 2
+tab_width = 2
 
 # c# 文件
 [*.cs]
@@ -116,6 +113,7 @@ csharp_style_prefer_readonly_struct = true
 # 代码块首选项
 csharp_prefer_braces = true:silent
 csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
 csharp_style_namespace_declarations = file_scoped:suggestion
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
@@ -131,6 +129,7 @@ csharp_style_prefer_null_check_over_type_check = true
 csharp_style_prefer_range_operator = true
 csharp_style_prefer_tuple_swap = true
 csharp_style_prefer_utf8_string_literals = true
+csharp_style_prefer_primary_constructors = true:suggestion
 csharp_style_throw_expression = true
 csharp_style_unused_value_assignment_preference = discard_variable
 csharp_style_unused_value_expression_statement_preference = discard_variable
@@ -297,7 +296,3 @@ dotnet_naming_style.以_为前缀.required_prefix = _
 dotnet_naming_style.以_为前缀.required_suffix = 
 dotnet_naming_style.以_为前缀.word_separator = 
 dotnet_naming_style.以_为前缀.capitalization = camel_case
-
-[*.csproj]
-indent_size = 2
-tab_width = 2

.github/workflows/PublishNugetPackage.yml

@@ -11,15 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET Core SDK
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: |
+          8.x
+          9.x
     - name: restore dependencies
       run: dotnet restore
     - name: build
       run: dotnet build --no-restore -c Release
+    - name: test
+      run: dotnet test -f net9.0 && dotnet test -c Release -f net9.0
     - name: pack
       run: dotnet pack -c Release -o ./output
     - name: push package

Cuture.Extensions.SystemTextJson.Dynamic.sln

@@ -0,0 +1,22 @@
+<Solution>
+  <Folder Name="/.github/" />
+  <Folder Name="/.github/workflows/">
+    <File Path=".github/workflows/PublishNugetPackage.yml" />
+  </Folder>
+  <Folder Name="/benchmark/">
+    <Project Path="benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark.csproj" />
+  </Folder>
+  <Folder Name="/solution items/">
+    <File Path=".editorconfig" />
+    <File Path="Directory.Build.props" />
+    <File Path="global.json" />
+    <File Path="LICENSE.txt" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/Cuture.Extensions.SystemTextJson.Dynamic.Test/Cuture.Extensions.SystemTextJson.Dynamic.Test.csproj" />
+  </Folder>
+</Solution>

Cuture.Extensions.SystemTextJson.Dynamic.slnx

@@ -44,6 +44,15 @@ var c = json.a.b.c;
 
 //访问数组
 var v2 = json.x[1];
+var v3 = json.x.last();
+var v4 = json.x.first();
+var v5 = json.x.push(obj);
+var v6 = json.x.pop();
+var v7 = json.x.add(obj);
+var v8 = json.x.append(obj);
+var v9 = json.x.insert(1,obj);
+var va = json.x.RemoveAt(1);
+json.x.clear();
 
 //访问属性并转换为基础数据类型
 bool b1 = json.b;

README.md

@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSTest.Sdk": "3.5.0"
+    "MSTest.Sdk": "3.10.0"
   }
 }

global.json

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -36,7 +36,7 @@
 
     <Authors>Stratos</Authors>
 
-    <Version>1.0.3</Version>
+    <Version>1.1.0</Version>
 
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/cuture/Cuture.Extensions.SystemTextJson.Dynamic</PackageProjectUrl>

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

@@ -124,6 +124,111 @@ public override bool TryGetMember(GetMemberBinder binder, out object? result)
         return base.TryGetMember(binder, out result);
     }
 
+    public override bool TryInvokeMember(InvokeMemberBinder binder, object?[]? args, out object? result)
+    {
+        switch (binder.Name.ToLowerInvariant())
+        {
+            case "insert":
+                {
+                    if (args?.Length != 2
+                        || args[0] is not int index)
+                    {
+                        throw new InvalidOperationException($"Method \"{binder.Name}\" for array must has 2 argument with 'index' and 'value'.");
+                    }
+
+                    if (index < _jsonArray.Count)
+                    {
+                        var node = JsonNode.Parse(JSON.stringify(args[1]));
+                        _jsonArray.Insert(index, node);
+
+                        result = JsonNodeUtil.GetNodeAccessValue(node);
+                    }
+                    else
+                    {
+                        result = SetValueAtIndex(index, args[1]);
+                    }
+
+                    return true;
+                }
+
+            case "append":
+            case "add":
+            case "push":
+                {
+                    if (args?.Length > 0 != true)
+                    {
+                        throw new InvalidOperationException($"Method \"{binder.Name}\" for array must has argument.");
+                    }
+
+                    result = null;
+
+                    foreach (var item in args)
+                    {
+                        result = SetValueAtIndex(_jsonArray.Count, item);
+                    }
+                    return true;
+                }
+
+            case "pop":
+                {
+                    var index = _jsonArray.Count - 1;
+                    if (index >= 0)
+                    {
+                        result = JsonNodeUtil.GetNodeAccessValue(_jsonArray[index]);
+                        _jsonArray.RemoveAt(index);
+                    }
+                    else
+                    {
+                        result = null;
+                    }
+                    return true;
+                }
+
+            case "removeat":
+                {
+                    if (args?.Length != 1
+                        || args[0] is not int index)
+                    {
+                        throw new InvalidOperationException($"Method \"{binder.Name}\" for array must has 1 argument with 'index'.");
+                    }
+                    var node = _jsonArray[index];
+                    _jsonArray.RemoveAt(index);
+                    result = JsonNodeUtil.GetNodeAccessValue(node);
+                    return true;
+                }
+
+            case "clear":
+            case "removeall":
+                {
+                    while (_jsonArray.Count > 0)
+                    {
+                        _jsonArray.RemoveAt(0);
+                    }
+                    result = null;
+                    return true;
+                }
+
+            case "first":
+            case "firstordefault":
+                {
+                    result = _jsonArray.Count > 0
+                             ? JsonNodeUtil.GetNodeAccessValue(_jsonArray[0])
+                             : null;
+                    return true;
+                }
+
+            case "last":
+            case "lastordefault":
+                {
+                    result = _jsonArray.Count > 0
+                             ? JsonNodeUtil.GetNodeAccessValue(_jsonArray[_jsonArray.Count - 1])
+                             : null;
+                    return true;
+                }
+        }
+        return base.TryInvokeMember(binder, args, out result);
+    }
+
     public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object? value)
     {
         if (indexes.Length > 1)
@@ -135,11 +240,7 @@ public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object
 
         if (index is int intIndex)
         {
-            while (intIndex >= _jsonArray.Count)
-            {
-                _jsonArray.Add(null);
-            }
-            _jsonArray[intIndex] = JsonNode.Parse(JSON.stringify(value));
+            SetValueAtIndex(intIndex, value);
             return true;
         }
 #if NET6_0_OR_GREATER
@@ -170,6 +271,22 @@ public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object
 
     #endregion Public 方法
 
+    #region Private 方法
+
+    private object? SetValueAtIndex(int index, object? value)
+    {
+        while (index >= _jsonArray.Count)
+        {
+            _jsonArray.Add(null);
+        }
+        var node = JsonNode.Parse(JSON.stringify(value));
+        _jsonArray[index] = node;
+
+        return JsonNodeUtil.GetNodeAccessValue(node);
+    }
+
+    #endregion Private 方法
+
     #region Private 类
 
     private class JsonArrayEnumerator : IEnumerator

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

@@ -1,8 +1,8 @@
 <Project Sdk="MSTest.Sdk">
 
   <PropertyGroup>
-		<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
-	</PropertyGroup>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
 
   <ItemGroup>
     <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />